Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

Commit 3ef11ec

Browse files
test: set single appium configuration file for all demo apps
1 parent ef0f0ba commit 3ef11ec

File tree

8 files changed

+20
-13
lines changed

8 files changed

+20
-13
lines changed

demo/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
node_modules
22
platforms
3+
testapp
4+
*-report.*
5+
36
hooks
47
report
58

demo/AngularApp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"build-ios-bundle": "npm run ns-bundle --ios --build-app",
6969
"publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
7070
"generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install",
71-
"e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
71+
"e2e": "tsc -p e2e && mocha --opts .../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
7272
"compile-tests": "tsc -p e2e --watch"
7373
}
7474
}

demo/JavaScriptApp/e2e/config/mocha.opts

Lines changed: 0 additions & 4 deletions
This file was deleted.

demo/JavaScriptApp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@
4747
"build-ios-bundle": "npm run ns-bundle --ios --build-app",
4848
"publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
4949
"generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install",
50-
"e2e": "mocha --opts ./e2e/config/mocha.opts"
50+
"e2e": "tsc -p e2e && mocha --opts .../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json"
5151
}
5252
}

demo/TypeScriptApp/e2e/config/mocha.opts

Lines changed: 0 additions & 4 deletions
This file was deleted.

demo/TypeScriptApp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"build-ios-bundle": "npm run ns-bundle --ios --build-app",
5454
"publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
5555
"generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install",
56-
"e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
56+
"e2e": "tsc -p e2e && mocha --opts .../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
5757
"compile-tests": "tsc -p e2e --watch"
5858
}
5959
}

demo/AngularApp/e2e/config/appium.capabilities.json renamed to demo/config/appium.capabilities.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,14 @@
7979
"fullReset": false,
8080
"app": ""
8181
},
82+
"sim.iPhone7.iOS110": {
83+
"platformName": "iOS",
84+
"platformVersion": "11.2",
85+
"deviceName": "iPhone 7 110",
86+
"noReset": true,
87+
"fullReset": false,
88+
"app": ""
89+
},
8290
"sim.iPhone8.iOS110": {
8391
"platformName": "iOS",
8492
"platformVersion": "11.2",
@@ -90,17 +98,21 @@
9098
"sim.iPhoneX.iOS110": {
9199
"platformName": "iOS",
92100
"platformVersion": "11.2",
101+
<<<<<<< HEAD:demo/AngularApp/e2e/config/appium.capabilities.json
93102
"deviceName": "iPhone X",
103+
=======
104+
"deviceName": "iPhone X 110",
105+
>>>>>>> ee05e7a... test: set single appium configuration file for all demo apps:demo/config/appium.capabilities.json
94106
"noReset": true,
95107
"fullReset": false,
96108
"app": ""
97109
},
98110
"sim.iPhoneX.iOS111": {
99111
"platformName": "iOS",
100112
"platformVersion": "11.1",
101-
"deviceName": "iPhone X",
113+
"deviceName": "iPhone X 111",
102114
"noReset": true,
103115
"fullReset": false,
104116
"app": ""
105117
}
106-
}
118+
}
File renamed without changes.

0 commit comments

Comments
 (0)