Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
{
"travis-e2e-tests": {
"platformName": "Android",
"platformVersion": "4.4",
"deviceName": "test",
"lt": 60000,
"appActivity": "com.tns.NativeScriptActivity",
"newCommandTimeout": 720,
"noReset": true,
"fullReset": false,
"app": ""
},
"nexus5": {
"browserName": "",
"platformName": "Android",
Expand Down Expand Up @@ -81,6 +92,18 @@
"fullReset": false,
"app": ""
},
"android27": {
"platformName": "Android",
"platformVersion": "27",
"deviceName": "Emulator-Api27-Google",
"avd": "Emulator-Api27-Google",
"lt": 60000,
"appActivity": "com.tns.NativeScriptActivity",
"newCommandTimeout": 720,
"noReset": true,
"fullReset": false,
"app": ""
},
"sim.iPhone7.iOS100": {
"platformName": "iOS",
"platformVersion": "10.0",
Expand All @@ -96,5 +119,21 @@
"noReset": true,
"fullReset": false,
"app": ""
},
"sim.iPhone8.iOS112": {
"platformName": "iOS",
"platformVersion": "11.2",
"deviceName": "iPhone 8 112",
"noReset": true,
"fullReset": false,
"app": ""
},
"sim.iPhoneX.iOS110": {
"platformName": "iOS",
"platformVersion": "11.2",
"deviceName": "iPhone X 110",
"noReset": true,
"fullReset": false,
"app": ""
}
}
File renamed without changes.
2 changes: 1 addition & 1 deletion e2e/renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"webpack-sources": "~1.1.0"
},
"scripts": {
"e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
"compile-tests-w": "tsc -p e2e --watch",
"update-app-ng-deps": "update-app-ng-deps"
}
Expand Down
100 changes: 0 additions & 100 deletions e2e/router/e2e/config/appium.capabilities.json

This file was deleted.

4 changes: 0 additions & 4 deletions e2e/router/e2e/config/mocha.opts

This file was deleted.

2 changes: 1 addition & 1 deletion e2e/router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"webpack-sources": "~1.1.0"
},
"scripts": {
"e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
"compile-tests-w": "tsc -p e2e --watch",
"update-app-ng-deps": "update-app-ng-deps"
}
Expand Down
101 changes: 0 additions & 101 deletions tests/e2e/config/appium.capabilities.json

This file was deleted.

4 changes: 0 additions & 4 deletions tests/e2e/config/mocha.opts

This file was deleted.

2 changes: 1 addition & 1 deletion tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"mocha": "~3.5.0"
},
"scripts": {
"e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
"e2e": "tsc -p e2e && mocha --opts ../e2e/config/mocha.opts --recursive e2e --appiumCapsLocation ../e2e/config/appium.capabilities.json",
"compile-tests-w": "tsc -p e2e --watch",
"update-app-ng-deps": "update-app-ng-deps"
}
Expand Down