83120a5bea
CB-8382 Make CordovaActivity not implement CordovaInterface
...
Instead, use a CordovaInterfaceImpl class. This also makes it easier
for apps to implement the interface without extending CordovaActivity.
2015-02-03 16:27:16 -05:00
a2fed200fe
CB-8378 Remove reference to LinearLayoutSoftKeyboardDetect from unit tests
2015-01-30 10:26:33 -05:00
efeeef214b
Paste in the command for downloading robotium in tests readme
2015-01-30 10:17:18 -05:00
3b909253bb
Merge branch 'master' into 4.0.x (gradle plugin extension)
2015-01-26 16:28:31 -05:00
f459eaa5ea
Add missing license to gradle file.
2015-01-22 15:22:55 -05:00
076e93184b
Make unit tests compile on 4.0.x (couple APIs changed)
2015-01-20 15:03:46 -05:00
c352b296da
Merge branch 'master' into 4.0.x (gradlify tests)
...
Conflicts:
test/androidTest/src/org/apache/cordova/test/junit/MenuTest.java
2015-01-20 14:55:44 -05:00
9e04eec9dd
Make BackButtonMultiPageTest tests not hang forever.
...
They still don't pass, but at least fail now.
2015-01-20 14:53:31 -05:00
0e19f88a04
Make unit tests work with Gradle
...
Had to split the test app from the tests, since that's how gradle forces
you to do it.
2015-01-20 14:31:59 -05:00
e788e8fa0f
Delete test/ ant files and cordova scripts
2015-01-20 14:14:39 -05:00
7f4d5aeb0e
Merge branch 'master' into 4.0.x (move preference activation, alert dialog leak)
...
Conflicts:
framework/src/org/apache/cordova/AndroidChromeClient.java
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaWebView.java
test/src/org/apache/cordova/test/menus.java
closes #123
2014-10-04 15:30:25 -04:00
6cbf6b7875
CB-7674: Added sleep to avoid null error after most recent change to not break API
2014-09-30 17:57:42 -07:00
c255a84941
CB-7674 move preference activation back into onCreate()
...
The preference creation actually needs to be before
super.onCreate(savedInstance) in order to avoid the exception
"requestFeature() must be called before adding content". Also ran into an
issue in the native tests "Whitelist" and "User WebView/Client/Chrome" where
it would throw an exception that the CordovaWebView appView already had
a parent and needed to be removed from that parent before the invocation
to root.addView(appView). So I conditionally remove the wrong parent.
Also made a change to the native tests so the menus test would work.
I also put super.init() back into the template, though invoking it is optional
as loadUrl will call it automatically if needed.
2014-09-30 19:38:34 -04:00
e5efc91ef4
Merge branch 'master' into 4.0.x (JAVA_HOME on Ubuntu)
2014-09-29 10:16:33 -04:00
a658ea1573
CB-7410 update the docs to match the actual title
2014-09-25 11:25:09 -04:00
dd5a337a49
Merge branch 'master' into 4.0.x
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
2014-09-11 10:18:35 -04:00
51e634ccb4
Merge branch 'master' into 4.0.x (up to 3.7.0-dev)
...
Conflicts:
VERSION
bin/templates/cordova/version
framework/src/org/apache/cordova/CordovaWebView.java
package.json
test/src/org/apache/cordova/test/basicauth.java
test/src/org/apache/cordova/test/menus.java
2014-09-11 10:16:46 -04:00
31b1a821ca
Merge branch 'master' into 4.0.x (External whitelist changes)
2014-09-11 10:08:45 -04:00
81cc3c260f
CB-7463: Adding licences. I don't know what the gradle syntax is for comments, that still needs to be done.
2014-09-04 10:32:29 -07:00
0cde8819cf
CB-7410 fix the menu test
...
Need to show the title in order for the options menu button to be visible.
2014-08-29 18:07:29 -04:00
07632b0eeb
CB-7410 Fix the errorUrl test
...
Make the error.html page a well-formed html document, otherwise it
won't display.
2014-08-29 17:38:03 -04:00
4a7f825cfe
CB-7410 Fix Basic Authentication test
...
Looks like the Chromium webview does not include the port number on the
hostname during the callback challenge, but the classic webview does
include the port number. Handle both cases here.
2014-08-29 16:41:51 -04:00
12a27643db
CB-7410 clarify the title
2014-08-27 13:56:31 -04:00
16e3ebd87b
CB-7410 add whitelist entries to get iframe/GoogleMaps working
2014-08-26 17:20:58 -04:00
94c096dd5b
CB-7291 propogate change in method signature to the native tests
2014-08-26 16:38:04 -04:00
4c1942e3fe
Merge branch 'master' into 4.0.x (build & create script updates)
...
Conflicts:
bin/lib/check_reqs.js
bin/lib/create.js
bin/node_modules/which/package.json
bin/templates/cordova/lib/build.js
2014-08-19 12:02:36 -04:00
50ea162251
Change in test's AndroidManifest.xml needed for the test to run properly. Forgot the manifest.
2014-08-14 14:30:31 -07:00
9c239804d3
Change in test's AndroidManifest.xml needed for the test to run properly
2014-08-14 14:29:54 -07:00
a7ccb9243d
Merging latest master, including new tests
2014-08-14 14:20:49 -07:00
320e31bb10
Adding tests related to 3.5.1
2014-08-12 11:09:53 -07:00
48b51c451a
CB-7238: I should have collapsed this, but Config.init() must go before the creation of CordovaWebView
2014-07-31 09:23:14 -07:00
3d191d5884
CB-7238: Minor band-aid to get tests running again, this has to go away before 3.6.0 is released, since this is an API change.
2014-07-31 08:17:31 -07:00
e2b3f76a10
Merge branch 'master' into 4.0.x (PluginEntry refactor)
...
Conflicts:
framework/src/org/apache/cordova/PluginEntry.java
framework/src/org/apache/cordova/PluginManager.java
test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
2014-07-14 14:18:10 -04:00
a33cdc9c7b
Fix broken unit test due to missing Config.init() call
2014-07-14 14:06:47 -04:00
f38c460588
Merge branch 'master' into 4.0.x (Unbreak unit tests)
...
Conflicts:
test/src/org/apache/cordova/test/junit/GapClientTest.java
test/src/org/apache/cordova/test/userwebview.java
test/src/org/apache/cordova/test/whitelist.java
2014-07-10 10:30:05 -04:00
d8a19b5565
Update unit tests to not use most deprecated things (e.g. DroidGap)
2014-07-10 10:23:44 -04:00
9358838dab
Merge branch 'master' into 4.0.x (unit test tweaks)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-07-09 21:12:45 -04:00
2f24e42dc1
Make CordovaWebview resilient to init() not being called (for backwards-compatibility)
...
This can happen when apps are not utilizing CordovaActivity and instead
creating their own CordovaWebView.
2014-07-09 21:08:29 -04:00
9c5e340fb8
Merge branch 'master' into 4.0.x (App plugin from config.xml -> code)
...
Conflicts:
bin/templates/cordova/defaults.xml
framework/res/xml/config.xml
framework/src/org/apache/cordova/CordovaWebView.java
2014-07-08 11:52:44 -04:00
e86c2e5970
Move registration of App plugin from config.xml -> code
...
Less fragile this way.
2014-07-08 11:47:26 -04:00
c47bcb2f54
This breaks running the JUnit tests, we'll bring it back soon
2014-06-24 12:55:56 -07:00
8ac067da89
Rethinking the URI helper
2014-06-19 13:20:44 -07:00
6abb9da88a
Merge branch 'master' into 4.0.x
...
Conflicts:
bin/templates/project/custom_rules.xml
framework/src/org/apache/cordova/CordovaWebView.java
test/src/org/apache/cordova/test/junit/MessageTest.java
2014-06-08 22:54:21 -04:00
2661e010d9
CB-6784 Add missing licenses
...
for ./test/assets/www/cordova_plugins.js and ./test/res/xml/config.xml
2014-05-30 15:10:54 -04:00
f77b20bbca
CB-6723 Update package name for Robotium
2014-05-23 11:31:13 -07:00
1d0a1664e6
CB-6707 Update minSdkVersion to 10 consistently
...
Update minSdkVersion in the AndroidManifest for the cordova.jar and the
test project.
2014-05-23 11:30:58 -07:00
1dcba51092
Set VERSION to 3.6.0-dev (via coho)
2014-05-23 11:30:57 -07:00
e98f6ae570
CB-6723 Update package name for Robotium
2014-05-20 07:09:02 -04:00
0b5bf0c098
CB-6707 Update minSdkVersion to 10 consistently
...
Update minSdkVersion in the AndroidManifest for the cordova.jar and the
test project.
2014-05-20 07:00:21 -04:00
b6664cc859
Added two more required methods to CordovaWebView to get the Junit tests running, removed tests that make no sense
2014-05-14 11:09:21 -07:00
Andrew Grieve