Merge master --> 1.2.x
diff --git a/README.md b/README.md
index 5352a68..dd23ae5 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@
# under the License.
-->
-|Android 4.4|Android 5.1|iOS 9.3|iOS 10.0|Windows 10 Store|Travis CI|
-|:-:|:-:|:-:|:-:|:-:|:-:|
-|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-device-motion/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-device-motion/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-device-motion/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-device-motion/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-device-motion/)|[](https://travis-ci.org/apache/cordova-plugin-device-motion)|
+|Android 4.4|Android 5.1|Android 6.0|iOS 9.3|iOS 10.0|Windows 10 Store|Travis CI|
+|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
+|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-device-motion/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-device-motion/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-6.0,PLUGIN=cordova-plugin-device-motion/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-device-motion/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-device-motion/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-device-motion/)|[](https://travis-ci.org/apache/cordova-plugin-device-motion)|
# cordova-plugin-device-motion
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9c29a80..f1180a0 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,11 @@
-->
# Release Notes
+### 1.2.5 (Apr 27, 2017)
+* [CB-12622](https://issues.apache.org/jira/browse/CB-12622) Added **Android 6.0** build badge to `README`
+* [CB-12685](https://issues.apache.org/jira/browse/CB-12685) added `package.json` to tests folder
+* [CB-10559](https://issues.apache.org/jira/browse/CB-10559) (android) Relaxed a time stamp condition to fix flaky tests
+
### 1.2.4 (Feb 28, 2017)
* [CB-12353](https://issues.apache.org/jira/browse/CB-12353) Corrected merges usage in `plugin.xml`
* [CB-12369](https://issues.apache.org/jira/browse/CB-12369) Add plugin typings from `DefinitelyTyped`
diff --git a/package.json b/package.json
index 2ea04d6..b3adca9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-device-motion",
- "version": "1.2.4",
+ "version": "1.2.5",
"description": "Cordova Device Motion Plugin",
"types": "./types/index.d.ts",
"cordova": {
diff --git a/plugin.xml b/plugin.xml
index 1f9125f..b8409fe 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -20,7 +20,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="cordova-plugin-device-motion"
- version="1.2.4">
+ version="1.2.5">
<name>Device Motion</name>
<description>Cordova Device Motion Plugin</description>
diff --git a/tests/package.json b/tests/package.json
new file mode 100644
index 0000000..af98e2c
--- /dev/null
+++ b/tests/package.json
@@ -0,0 +1,14 @@
+{
+ "name": "cordova-plugin-device-motion-tests",
+ "version": "1.2.5-dev",
+ "description": "",
+ "cordova": {
+ "id": "cordova-plugin-device-motion-tests",
+ "platforms": []
+ },
+ "keywords": [
+ "ecosystem:cordova"
+ ],
+ "author": "",
+ "license": "Apache 2.0"
+}
diff --git a/tests/plugin.xml b/tests/plugin.xml
index d9bfbc9..684ade6 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -20,7 +20,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="cordova-plugin-device-motion-tests"
- version="1.2.4">
+ version="1.2.5">
<name>Cordova Device Motion Plugin Tests</name>
<license>Apache 2.0</license>
diff --git a/tests/tests.js b/tests/tests.js
index 5deec41..e5bc63f 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -111,7 +111,7 @@
// In case the timestamps returned are ridiculously high
var reasonableTimeLimit = veryRecently + 5000; // 5 seconds from now
var win = function(a) {
- expect(a.timestamp).toBeGreaterThan(veryRecently);
+ expect(a.timestamp).toBeGreaterThan(veryRecently - 200); // this is flakey, relaxing a bit
expect(a.timestamp).toBeLessThan(reasonableTimeLimit);
done();
};
@@ -187,7 +187,7 @@
// In case the timestamps returned are ridiculously high
var reasonableTimeLimit = veryRecently + 5000; // 5 seconds from now
var win = function(a) {
- expect(a.timestamp).toBeGreaterThan(veryRecently);
+ expect(a.timestamp).toBeGreaterThan(veryRecently - 200); // this is flakey, relaxing a bit
expect(a.timestamp).toBeLessThan(reasonableTimeLimit);
done();
};
