Skip to content

Commit c264453

Browse files
author
Alexander Vakrilov
authored
feat: Angular 4.4 support (#1002)
* chore(update): Update deps to angular 4.4.1 * chore(update): Replace OpaqueTokens with InjectionTokens. * chore(update): Stop passing any arguments to the constructor for ErrorHandler * chore(update): Update apps deps * feat(http): Support for HttpClinet with "nativescript-angular/http-client" module. * test(http): Add tests for NsHttpBackEnd * chore(cleanup): Remove unused imports * fix: Fixed runt * Update test to be compatible with next version of nativescript-dev-appium * Upade vs settings and .gitignore * refactor: Minor changes based on PR review * refactor: Extract common http methods * chore: Removing .vscode folder form rotuer tests * refactor: Renamed some methods for clarity
1 parent 8596164 commit c264453

27 files changed

+763
-496
lines changed

Diff for: e2e/renderer/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
}
1111
},
1212
"dependencies": {
13-
"@angular/animations": "~4.2.0",
14-
"@angular/common": "~4.2.0",
15-
"@angular/compiler": "~4.2.0",
16-
"@angular/core": "~4.2.0",
17-
"@angular/forms": "~4.2.0",
18-
"@angular/http": "~4.2.0",
19-
"@angular/platform-browser": "~4.2.0",
20-
"@angular/router": "~4.2.0",
13+
"@angular/animations": "~4.4.1",
14+
"@angular/common": "~4.4.1",
15+
"@angular/compiler": "~4.4.1",
16+
"@angular/core": "~4.4.1",
17+
"@angular/forms": "~4.4.1",
18+
"@angular/http": "~4.4.1",
19+
"@angular/platform-browser": "~4.4.1",
20+
"@angular/router": "~4.4.1",
2121
"nativescript-angular": "file:../../nativescript-angular",
2222
"nativescript-intl": "^3.0.0",
2323
"reflect-metadata": "~0.1.8",

Diff for: e2e/router/.gitignore

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
.vscode
2+
13
platforms
24
node_modules
35
hooks
46

5-
app/**/*.js
6-
e2e/**/*.js
7-
test-results.xml
8-
7+
/**/*.js
8+
/**/*.map
9+
e2e/reports
10+
test-results.xml

Diff for: e2e/router/e2e/config/appium.capabilities.json

+42-26
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,100 @@
11
{
22
"nexus5": {
33
"browserName": "",
4-
"appium-version": "1.6.5",
54
"platformName": "Android",
65
"platformVersion": "6.0",
76
"deviceName": "device",
87
"udid": "077e4a47003b7698",
9-
"-lt": 60000,
10-
"automationName": "Appium",
118
"appActivity": "com.tns.NativeScriptActivity",
129
"app": ""
1310
},
1411
"android19": {
15-
"browserName": "",
16-
"appium-version": "1.6.5",
1712
"platformName": "Android",
1813
"platformVersion": "4.4",
1914
"deviceName": "Emulator-Api19-Default",
2015
"avd": "Emulator-Api19-Default",
21-
"-lt": 60000,
22-
"automationName": "Appium",
16+
"lt": 60000,
2317
"appActivity": "com.tns.NativeScriptActivity",
2418
"newCommandTimeout": 720,
25-
"noReset": true,
19+
"noReset": false,
2620
"fullReset": false,
2721
"app": ""
2822
},
2923
"android21": {
30-
"browserName": "",
31-
"appium-version": "1.6.5",
3224
"platformName": "Android",
3325
"platformVersion": "5.0",
3426
"deviceName": "Emulator-Api21-Default",
3527
"avd": "Emulator-Api21-Default",
36-
"-lt": 60000,
37-
"automationName": "Appium",
28+
"lt": 60000,
3829
"appActivity": "com.tns.NativeScriptActivity",
3930
"newCommandTimeout": 720,
40-
"noReset": true,
31+
"noReset": false,
4132
"fullReset": false,
4233
"app": ""
4334
},
4435
"android23": {
45-
"browserName": "",
46-
"appium-version": "1.6.5",
4736
"platformName": "Android",
4837
"platformVersion": "6.0",
4938
"deviceName": "Emulator-Api23-Default",
5039
"avd": "Emulator-Api23-Default",
51-
"-lt": 60000,
52-
"automationName": "Appium",
40+
"lt": 60000,
5341
"appActivity": "com.tns.NativeScriptActivity",
5442
"newCommandTimeout": 720,
55-
"noReset": true,
43+
"noReset": false,
5644
"fullReset": false,
5745
"app": ""
5846
},
5947
"android24": {
60-
"browserName": "",
61-
"appium-version": "1.6.5",
6248
"platformName": "Android",
6349
"platformVersion": "7.0",
6450
"deviceName": "Emulator-Api24-Default",
6551
"avd": "Emulator-Api24-Default",
66-
"-lt": 60000,
52+
"lt": 60000,
53+
"appActivity": "com.tns.NativeScriptActivity",
54+
"newCommandTimeout": 720,
55+
"noReset": false,
56+
"fullReset": false,
57+
"app": ""
58+
},
59+
"android25": {
60+
"platformName": "Android",
61+
"platformVersion": "7.1",
62+
"deviceName": "Emulator-Api25-Google",
63+
"avd": "Emulator-Api25-Google",
64+
"lt": 60000,
65+
"appActivity": "com.tns.NativeScriptActivity",
66+
"newCommandTimeout": 720,
67+
"noReset": false,
68+
"fullReset": false,
69+
"app": ""
70+
},
71+
"android26": {
72+
"platformName": "Android",
73+
"platformVersion": "8.0",
74+
"deviceName": "Emulator-Api26-Google",
75+
"avd": "Emulator-Api26-Google",
76+
"lt": 60000,
6777
"automationName": "UIAutomator2",
6878
"appActivity": "com.tns.NativeScriptActivity",
6979
"newCommandTimeout": 720,
70-
"noReset": true,
80+
"noReset": false,
7181
"fullReset": false,
7282
"app": ""
7383
},
7484
"sim.iPhone7.iOS100": {
75-
"browserName": "",
76-
"appium-version": "1.6.5",
7785
"platformName": "iOS",
7886
"platformVersion": "10.0",
7987
"deviceName": "iPhone 7 100",
80-
"noReset": true,
88+
"noReset": false,
89+
"fullReset": false,
90+
"app": ""
91+
},
92+
"sim.iPhone7.iOS110": {
93+
"platformName": "iOS",
94+
"platformVersion": "11.0",
95+
"deviceName": "iPhone 7 110",
96+
"noReset": false,
8197
"fullReset": false,
8298
"app": ""
8399
}
84-
}
100+
}

Diff for: e2e/router/e2e/helpers/appium-elements.ts

-41
This file was deleted.

0 commit comments

Comments
 (0)