diff --git a/e2e/ui-tests-app/.gitignore b/e2e/ui-tests-app/.gitignore index 918f89798..ab763f9f9 100644 --- a/e2e/ui-tests-app/.gitignore +++ b/e2e/ui-tests-app/.gitignore @@ -27,7 +27,7 @@ typings/ # Visual Studio Code .vscode/* -!.vscode/settings.json +.vscode/settings.json !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json diff --git a/e2e/ui-tests-app/.vscode/launch.json b/e2e/ui-tests-app/.vscode/launch.json index 8260f92d4..a98b1ecf5 100644 --- a/e2e/ui-tests-app/.vscode/launch.json +++ b/e2e/ui-tests-app/.vscode/launch.json @@ -4,10 +4,22 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ + { + "name": "Launch on iOS", + "type": "nativescript", + "request": "launch", + "platform": "ios", + "appRoot": "${workspaceRoot}", + "sourceMaps": true, + "watch": true, + "tnsArgs": [ + "--debug-brk" + ] + }, { "type": "node", "request": "launch", - "name": "Mocha Tests", + "name": "debug-tests", "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha", "args": [ "-u", @@ -15,9 +27,28 @@ "--colors", "--opts", "../config/mocha.opts", - "--grep=tab-view", + "--grep=button", "-a", - + ], + "internalConsoleOptions": "openOnSessionStart", + // "preLaunchTask": "e2e-tsc" + }, + { + "type": "node", + "request": "launch", + "name": "run-tests", + "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha", + "args": [ + "-u", + "tdd", + "--colors", + "--opts", + "../config/mocha.opts", + "--grep=bottom-navigation", + "android", + "--grep=bottom-navigation", + "--port", + "8889", ], "internalConsoleOptions": "openOnSessionStart" } diff --git a/e2e/ui-tests-app/.vscode/tasks.json b/e2e/ui-tests-app/.vscode/tasks.json new file mode 100644 index 000000000..cb3c6d649 --- /dev/null +++ b/e2e/ui-tests-app/.vscode/tasks.json @@ -0,0 +1,12 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "e2e-tsc", + "command": "npm", + "args": ["run", "e2e-tsc"] + } + ] +} \ No newline at end of file diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_18.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_18.png new file mode 100755 index 000000000..0e08b122f Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_18.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_24.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_24.png new file mode 100755 index 000000000..2a9bc9caa Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_24.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_36.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_36.png new file mode 100755 index 000000000..582032b56 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_36.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_48.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_48.png new file mode 100755 index 000000000..0522d79e7 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_48.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_18.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_18.png new file mode 100755 index 000000000..53de3f359 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_18.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_24.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_24.png new file mode 100755 index 000000000..8063fa64f Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_24.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_36.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_36.png new file mode 100755 index 000000000..2a9bc9caa Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_36.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_48.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_48.png new file mode 100755 index 000000000..f3434107c Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_48.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_18.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_18.png new file mode 100755 index 000000000..2a9bc9caa Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_18.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_24.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_24.png new file mode 100755 index 000000000..f3434107c Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_24.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_36.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_36.png new file mode 100755 index 000000000..0522d79e7 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_36.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_48.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_48.png new file mode 100755 index 000000000..a3451d3c2 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xhdpi/baseline_motorcycle_black_48.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_18.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_18.png new file mode 100755 index 000000000..582032b56 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_18.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_24.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_24.png new file mode 100755 index 000000000..0522d79e7 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_24.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_36.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_36.png new file mode 100755 index 000000000..1bc61bfd1 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_36.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_48.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_48.png new file mode 100755 index 000000000..d0c6b11b5 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxhdpi/baseline_motorcycle_black_48.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_18.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_18.png new file mode 100755 index 000000000..0522d79e7 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_18.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_24.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_24.png new file mode 100755 index 000000000..a3451d3c2 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_24.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_36.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_36.png new file mode 100755 index 000000000..d0c6b11b5 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_36.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_48.png b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_48.png new file mode 100755 index 000000000..83e4ee845 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/baseline_motorcycle_black_48.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable/baseline_motorcycle_24.xml b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable/baseline_motorcycle_24.xml new file mode 100755 index 000000000..4b3723333 --- /dev/null +++ b/e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable/baseline_motorcycle_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/e2e/ui-tests-app/app/App_Resources/iOS/baseline_motorcycle_black_24@1x.png b/e2e/ui-tests-app/app/App_Resources/iOS/baseline_motorcycle_black_24@1x.png new file mode 100755 index 000000000..8063fa64f Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/iOS/baseline_motorcycle_black_24@1x.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/iOS/baseline_motorcycle_black_24@2x.png b/e2e/ui-tests-app/app/App_Resources/iOS/baseline_motorcycle_black_24@2x.png new file mode 100755 index 000000000..f3434107c Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/iOS/baseline_motorcycle_black_24@2x.png differ diff --git a/e2e/ui-tests-app/app/App_Resources/iOS/baseline_motorcycle_black_24@3x.png b/e2e/ui-tests-app/app/App_Resources/iOS/baseline_motorcycle_black_24@3x.png new file mode 100755 index 000000000..0522d79e7 Binary files /dev/null and b/e2e/ui-tests-app/app/App_Resources/iOS/baseline_motorcycle_black_24@3x.png differ diff --git a/e2e/ui-tests-app/app/bottom-navigation/background-color-page.xml b/e2e/ui-tests-app/app/bottom-navigation/background-color-page.xml index df04db28b..e6debcf2a 100644 --- a/e2e/ui-tests-app/app/bottom-navigation/background-color-page.xml +++ b/e2e/ui-tests-app/app/bottom-navigation/background-color-page.xml @@ -3,7 +3,7 @@ - + diff --git a/e2e/ui-tests-app/app/bottom-navigation/binding-page.ts b/e2e/ui-tests-app/app/bottom-navigation/binding-page.ts index d2f8710f9..90447f7a9 100644 --- a/e2e/ui-tests-app/app/bottom-navigation/binding-page.ts +++ b/e2e/ui-tests-app/app/bottom-navigation/binding-page.ts @@ -1,12 +1,6 @@ import * as vmModule from "./bottom-navigation-view-model"; -var viewModel = vmModule.bottomNavigationViewModel; - export function bottomNavigaitonLoaded(args) { - let bottomNav = args.object; - bottomNav.bindingContext = viewModel; -} - -export function addTabs(args) { - viewModel.createItems(); + const bottomNav = args.object.page; + bottomNav.bindingContext = vmModule.bottomNavigationViewModel; } \ No newline at end of file diff --git a/e2e/ui-tests-app/app/bottom-navigation/binding-page.xml b/e2e/ui-tests-app/app/bottom-navigation/binding-page.xml index 84c90e8fb..0e1114b16 100644 --- a/e2e/ui-tests-app/app/bottom-navigation/binding-page.xml +++ b/e2e/ui-tests-app/app/bottom-navigation/binding-page.xml @@ -1,12 +1,16 @@ - + - + -