Skip to content

Commit

Permalink
feat: Angular 4.4 support (#1002)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Alexander Vakrilov committed Oct 6, 2017
1 parent 8596164 commit c264453
Show file tree
Hide file tree
Showing 27 changed files with 763 additions and 496 deletions.
16 changes: 8 additions & 8 deletions e2e/renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
}
},
"dependencies": {
"@angular/animations": "~4.2.0",
"@angular/common": "~4.2.0",
"@angular/compiler": "~4.2.0",
"@angular/core": "~4.2.0",
"@angular/forms": "~4.2.0",
"@angular/http": "~4.2.0",
"@angular/platform-browser": "~4.2.0",
"@angular/router": "~4.2.0",
"@angular/animations": "~4.4.1",
"@angular/common": "~4.4.1",
"@angular/compiler": "~4.4.1",
"@angular/core": "~4.4.1",
"@angular/forms": "~4.4.1",
"@angular/http": "~4.4.1",
"@angular/platform-browser": "~4.4.1",
"@angular/router": "~4.4.1",
"nativescript-angular": "file:../../nativescript-angular",
"nativescript-intl": "^3.0.0",
"reflect-metadata": "~0.1.8",
Expand Down
10 changes: 6 additions & 4 deletions e2e/router/.gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
.vscode

platforms
node_modules
hooks

app/**/*.js
e2e/**/*.js
test-results.xml

/**/*.js
/**/*.map
e2e/reports
test-results.xml
68 changes: 42 additions & 26 deletions e2e/router/e2e/config/appium.capabilities.json
Original file line number Diff line number Diff line change
@@ -1,84 +1,100 @@
{
"nexus5": {
"browserName": "",
"appium-version": "1.6.5",
"platformName": "Android",
"platformVersion": "6.0",
"deviceName": "device",
"udid": "077e4a47003b7698",
"-lt": 60000,
"automationName": "Appium",
"appActivity": "com.tns.NativeScriptActivity",
"app": ""
},
"android19": {
"browserName": "",
"appium-version": "1.6.5",
"platformName": "Android",
"platformVersion": "4.4",
"deviceName": "Emulator-Api19-Default",
"avd": "Emulator-Api19-Default",
"-lt": 60000,
"automationName": "Appium",
"lt": 60000,
"appActivity": "com.tns.NativeScriptActivity",
"newCommandTimeout": 720,
"noReset": true,
"noReset": false,
"fullReset": false,
"app": ""
},
"android21": {
"browserName": "",
"appium-version": "1.6.5",
"platformName": "Android",
"platformVersion": "5.0",
"deviceName": "Emulator-Api21-Default",
"avd": "Emulator-Api21-Default",
"-lt": 60000,
"automationName": "Appium",
"lt": 60000,
"appActivity": "com.tns.NativeScriptActivity",
"newCommandTimeout": 720,
"noReset": true,
"noReset": false,
"fullReset": false,
"app": ""
},
"android23": {
"browserName": "",
"appium-version": "1.6.5",
"platformName": "Android",
"platformVersion": "6.0",
"deviceName": "Emulator-Api23-Default",
"avd": "Emulator-Api23-Default",
"-lt": 60000,
"automationName": "Appium",
"lt": 60000,
"appActivity": "com.tns.NativeScriptActivity",
"newCommandTimeout": 720,
"noReset": true,
"noReset": false,
"fullReset": false,
"app": ""
},
"android24": {
"browserName": "",
"appium-version": "1.6.5",
"platformName": "Android",
"platformVersion": "7.0",
"deviceName": "Emulator-Api24-Default",
"avd": "Emulator-Api24-Default",
"-lt": 60000,
"lt": 60000,
"appActivity": "com.tns.NativeScriptActivity",
"newCommandTimeout": 720,
"noReset": false,
"fullReset": false,
"app": ""
},
"android25": {
"platformName": "Android",
"platformVersion": "7.1",
"deviceName": "Emulator-Api25-Google",
"avd": "Emulator-Api25-Google",
"lt": 60000,
"appActivity": "com.tns.NativeScriptActivity",
"newCommandTimeout": 720,
"noReset": false,
"fullReset": false,
"app": ""
},
"android26": {
"platformName": "Android",
"platformVersion": "8.0",
"deviceName": "Emulator-Api26-Google",
"avd": "Emulator-Api26-Google",
"lt": 60000,
"automationName": "UIAutomator2",
"appActivity": "com.tns.NativeScriptActivity",
"newCommandTimeout": 720,
"noReset": true,
"noReset": false,
"fullReset": false,
"app": ""
},
"sim.iPhone7.iOS100": {
"browserName": "",
"appium-version": "1.6.5",
"platformName": "iOS",
"platformVersion": "10.0",
"deviceName": "iPhone 7 100",
"noReset": true,
"noReset": false,
"fullReset": false,
"app": ""
},
"sim.iPhone7.iOS110": {
"platformName": "iOS",
"platformVersion": "11.0",
"deviceName": "iPhone 7 110",
"noReset": false,
"fullReset": false,
"app": ""
}
}
}
41 changes: 0 additions & 41 deletions e2e/router/e2e/helpers/appium-elements.ts

This file was deleted.

Loading

0 comments on commit c264453

Please sign in to comment.