Merge branch 'master' into develop

Author: ppetrosh

Diff for: .impt.test

@@ -0,0 +1,11 @@
+{
+  "deviceGroupId": "c4640229-c02d-bb43-6fdb-e0844917cbd7",
+  "timeout": 90,
+  "stopOnFail": false,
+  "allowDisconnect": true,
+  "builderCache": false,
+  "testFiles": [
+    "*.test.nut",
+    "tests/**/*.test.nut"
+  ]
+}

Diff for: .imptest

@@ -1,10 +1,11 @@
 language: node_js
 
 node_js:
-  - '5.5'
+  - "node"
 
 before_script:
-  - npm i -g imptest@latest
+  - npm i -g imp-central-impt@latest
+  - impt auth login --local --lk ${EI_LOGIN_KEY}
 
 script:
-  - imptest test
+  - impt test run

Diff for: .travis.yml

@@ -9,7 +9,7 @@ The ConnectionManager class is an Electric Imp device-side library created to si
 ## Class Usage ##
 
 ### Constructor: ConnectionManager(*[settings]*) ###
- 
+
 ConnectionManager can be instantiated with an optional table of settings that modify its behavior. The following settings are available:
 
 | Key | Default | Notes |
@@ -239,7 +239,7 @@ See *log()*, above, for example code.
 
 Some tests change the test device’s WiFi configuration. To ensure that the test device’s WiFi settings are restored after the test run, you should set the environment variables *CM_TEST_SSID* and *CM_TEST_PWD* to the required WiFi SSID and password, respectively.
 
-Alternatively, you can create an `.imptest-builder` file with *CM_TEST_SSID* and *CM_TEST_PWD* defined within it. For example: 
+Alternatively, you can create an `.imptest-builder` file with *CM_TEST_SSID* and *CM_TEST_PWD* defined within it. For example:
 
 ```JSON
 { "CM_TEST_SSID": "<YOUR_WIFI_SSID>",

Diff for: README.md

@@ -28,9 +28,9 @@
 // Instantiate ConnectionManager so BlinkUp is always enabled,
 // and starts connected.
 cm <- ConnectionManager({
-    "startupBehavior": START_CONNECTED,
+    "startupBehavior": CM_START_CONNECTED,
     "connectTimeout": 90,
-    "blinkupBehavior": ConnectionManager.BLINK_ALWAYS
+    "blinkupBehavior": CM_BLINK_ALWAYS
 });
 
 // Set the timeout behaviour after failing to connect for 90 seconds.