mirror of
https://github.com/apache/cordova-android.git
synced 2026-05-30 00:00:04 +08:00
CB-5346 Fix and cleanup broken Android unit test
- Found stale cordova.js in the test project. Changed ant script to copy in a fresh one in the pre-build stage. Removed stale copies from git, added to .gitignore. This is what was causing the test failure when sending javascript to the webview. - Found almost-stale copy of device plugin, did the same as above. - Fixed spacing in log messages in CordovaWebView. - Updated README.md with current information. - Removed dollar signs that were previously accidently appended to the license. - Added cordova version to html pages, next to the other metadata. - Fix incorrect separator in the viewport meta tag. - Changed old-style <log> tag to <preference name="loglevel"> in config.xml. - In BackButtonMultiPageTest, increased the TIMEOUT so the deviceready event can trigger the referenced javascript, improved the setup() method to explicitly load the starting point.
This commit is contained in:
+26
-1
@@ -66,9 +66,34 @@
|
||||
|
||||
<!-- extension targets. Uncomment the ones where you want to do custom work
|
||||
in between standard targets -->
|
||||
<!--
|
||||
|
||||
<target name="-pre-build">
|
||||
<!-- copy in the current cordova.js file from the parent project -->
|
||||
<copy file="../framework/assets/www/cordova.js"
|
||||
todir="assets/www"
|
||||
preservelastmodified="true"
|
||||
failonerror="true"
|
||||
verbose="true" />
|
||||
<!-- copy the latest device plugin from the parent's peer -->
|
||||
<fail message="Need to have cordova-plugin-device cloned." >
|
||||
<condition>
|
||||
<not>
|
||||
<available file="../../cordova-plugin-device" type="dir" />
|
||||
</not>
|
||||
</condition>
|
||||
</fail>
|
||||
<copy file="../../cordova-plugin-device/www/device.js"
|
||||
tofile="cordova/plugins/org.apache.cordova.device/www/device.js"
|
||||
preservelastmodified="true"
|
||||
failonerror="true"
|
||||
verbose="true" />
|
||||
<copy file="../../cordova-plugin-device/src/android/Device.java"
|
||||
tofile="cordova/plugins/org.apache.cordova.device/src/android/Device.java"
|
||||
preservelastmodified="true"
|
||||
failonerror="true"
|
||||
verbose="true" />
|
||||
</target>
|
||||
<!--
|
||||
<target name="-pre-compile">
|
||||
</target>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user