8000 Merge branch 'master' into djenkov/limit-bottom-navigation-items · NativeScript/NativeScript@30195aa · GitHub
[go: up one dir, main page]
Skip to content

Commit 30195aa

Browse files
SvetoslavTsenovSvetoslavTsenov
authored
Merge branch 'master' into djenkov/limit-bottom-navigation-items
2 parents 7a23bc5 + 46db840 commit 30195aa

File tree

85 files changed

+1250
-361
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1250
-361
lines changed

‎e2e/ui-tests-app/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ typings/
2727

2828
# Visual Studio Code
2929
.vscode/*
30-
!.vscode/settings.json
30+
.vscode/settings.json
3131
!.vscode/tasks.json
3232
!.vscode/launch.json
3333
!.vscode/extensions.json

‎e2e/ui-tests-app/.vscode/launch.json

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,51 @@
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
"version": "0.2.0",
66
"configurations": [
7+
{
8+
"name": "Launch on iOS",
9+
"type": "nativescript",
10+
"request": "launch",
11+
"platform": "ios",
12+
"appRoot": "${workspaceRoot}",
13+
"sourceMaps": true,
14+
"watch": true,
15+
"tnsArgs": [
16+
"--debug-brk"
17+
]
18+
},
719
{
820
"type": "node",
921
"request": "launch",
10-
"name": "Mocha Tests",
22+
"name": "debug-tests",
1123
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
1224
"args": [
1325
"-u",
1426
"tdd",
1527
"--colors",
1628
"--opts",
1729
"../config/mocha.opts",
18-
"--grep=tab-view",
30+
"--grep=bottom-navigation",
1931
"-a",
20-
32+
],
33+
"internalConsoleOptions": "openOnSessionStart",
34+
// "preLaunchTask": "e2e-tsc"
35+
},
36+
{
37+
"type": "node",
38+
"request": "launch",
39+
"name": "run-tests",
40+
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
41+
"args": [
42+
"-u",
43+
"tdd",
44+
"--colors",
45+
"--opts",
46+
"../config/mocha.opts",
47+
"--grep=bottom-navigation",
48+
"android",
49+
"--grep=bottom-navigation",
50+
"--port",
51+
"8889",
2152
],
2253
"internalConsoleOptions": "openOnSessionStart"
2354
}

‎e2e/ui-tests-app/.vscode/tasks.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"label": "e2e-tsc",
8+
"command": "npm",
9+
"args": ["run", "e2e-tsc"]
10+
}
11+
]
12+
}

‎e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_18.png

324 Bytes
Loading

‎e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_24.png

389 Bytes
Loading

‎e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_36.png

565 Bytes
Loading

‎e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-hdpi/baseline_motorcycle_black_48.png

593 Bytes
Loading

‎e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_18.png

234 Bytes
Loading

‎e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_24.png

232 Bytes
Loading

‎e2e/ui-tests-app/app/App_Resources/Android/src/main/res/drawable-mdpi/baseline_motorcycle_black_36.png

389 Bytes
Loading

0 commit comments

Comments
 (0)
0