Skip to content

Commit c2b1d5a

Browse files
MartoYankovMartoYankov
authored
Merge pull request #7593 from NativeScript/myankov/merge-release
chore: merge release to master
2 parents 92238a9 + ef84afe commit c2b1d5a

25 files changed

+1147
-209
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ package-lock.json
3232
# Appium files
3333
e2e/**/*.trace/
3434
e2e/**/test-results.xml
35+
e2e/**/e2e/resources/
3536

3637
# Webpack configuration files
3738
webpack.config.js

‎e2e/nested-frame-navigation/app/app.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
import * as application from "tns-core-modules/application";
22

33
application.run({ moduleName: "app-root" });
4-
// application.run({ moduleName: "tab-root" });
5-
// application.run({ moduleName: "layout-root" });

‎e2e/nested-frame-navigation/app/bottom-navigation-page/bottom-navigation-page.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
22

33
<ActionBar class="action-bar">
4-
<NavigationButton text="tabBottomBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
4+
<NavigationButton text="bottomNavigationBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
55
<Label class="action-bar-title" text="bottom navigation page" horizontalAlignment="center" />
66
</ActionBar>
77

@@ -16,9 +16,9 @@
1616
<GridLayout row="1">
1717
<BottomNavigation>
1818
<TabStrip>
19-
<TabStripItem title="Players"></TabStripItem>
20-
<TabStripItem title="Dummy"></TabStripItem>
21-
<TabStripItem title="Teams"></TabStripItem>
19+
<TabStripItem title="Players" automationText="playersTabNavigation"></TabStripItem>
20+
<TabStripItem title="Dummy" automationText="dummyTabNavigation"></TabStripItem>
21+
<TabStripItem title="Teams" automationText="teamsTabNavigation"></TabStripItem>
2222
</TabStrip>
2323

2424
<TabContentItem>

‎e2e/nested-frame-navigation/app/bottom-navigation-root/bottom-navigation-root.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<BottomNavigation>
22
<TabStrip>
3-
<TabStripItem title="Players"></TabStripItem>
3+
<TabStripItem title="Players" automationText="playersTabNavigation"></TabStripItem>
44
<!-- this tab serves as dummy so the actual teams tab is not loaded by default -->
5-
<TabStripItem title="Dummy"></TabStripItem>
6-
<TabStripItem title="Teams"></TabStripItem>
5+
<TabStripItem title="Dummy" automationText="dummyTabNavigation"></TabStripItem>
6+
<TabStripItem title="Teams" automationText="teamsTabNavigation"></TabStripItem>
77
</TabStrip>
88

99
<TabContentItem>
1010
<GridLayout rows="auto, auto, *">
11-
<Label text="tabs root top home" />
11+
<Label text="bottom navigation root home" />
1212
<Button row="1" text="reset app" tap="onReset" />
1313
<GridLayout row="2">
1414
<Frame defaultPage="players/players-items-page" />

‎e2e/nested-frame-navigation/app/tab-page/tab-bottom-page.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
22

33
<ActionBar class="action-bar">
4-
<NavigationButton text="tabBottomBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
4+
<NavigationButton text="tabViewBottomBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
55
<Label class="action-bar-title" text="tabview bottom page" horizontalAlignment="center" />
66
</ActionBar>
77

‎e2e/nested-frame-navigation/app/tab-page/tab-top-page.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
22

33
<ActionBar class="action-bar">
4-
<NavigationButton text="tabTopBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
4+
<NavigationButton text="tabViewTopBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
55
<Label class="action-bar-title" text="tabview top page" horizontalAlignment="center" />
66
</ActionBar>
77

‎e2e/nested-frame-navigation/app/tabs-page/tabs-bottom-page.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
22

33
<ActionBar class="action-bar">
4-
<NavigationButton text="tabBottomBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
4+
<NavigationButton text="tabsBottomBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
55
<Label class="action-bar-title" text="tabs bottom page" horizontalAlignment="center" />
66
</ActionBar>
77

@@ -16,9 +16,9 @@
1616
<GridLayout row="1">
1717
<Tabs tabsPosition="bottom">
1818
<TabStrip>
19-
<TabStripItem title="Players"></TabStripItem>
20-
<TabStripItem title="Dummy"></TabStripItem>
21-
<TabStripItem title="Teams"></TabStripItem>
19+
<TabStripItem title="Players" automationText="playersTabNavigation"></TabStripItem>
20+
<TabStripItem title="Dummy" automationText="dummyTabNavigation"></TabStripItem>
21+
<TabStripItem title="Teams" automationText="teamsTabNavigation"></TabStripItem>
2222
</TabStrip>
2323

2424
<TabContentItem>

‎e2e/nested-frame-navigation/app/tabs-page/tabs-top-page.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
22

33
<ActionBar class="action-bar">
4-
<NavigationButton text="tabTopBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
4+
<NavigationButton text="tabsTopBack" tap="onBackButtonTap" android.systemIcon="ic_menu_back" />
55
<Label class="action-bar-title" text="tabs top page" horizontalAlignment="center" />
66
</ActionBar>
77

@@ -16,9 +16,9 @@
1616
<GridLayout row="1">
1717
<Tabs tabsPosition="top">
1818
<TabStrip>
19-
<TabStripItem title="Players"></TabStripItem>
20-
<TabStripItem title="Dummy"></TabStripItem>
21-
<TabStripItem title="Teams"></TabStripItem>
19+
<TabStripItem title="Players" automationText="playersTabNavigation"></TabStripItem>
20+
<TabStripItem title="Dummy" automationText="dummyTabNavigation"></TabStripItem>
21+
<TabStripItem title="Teams" automationText="teamsTabNavigation"></TabStripItem>
2222
</TabStrip>
2323

2424
<TabContentItem>

‎e2e/nested-frame-navigation/app/tabs-root/tabs-bottom-root.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Tabs tabsPosition="bottom">
22
<TabStrip>
3-
<TabStripItem title="Players"></TabStripItem>
3+
<TabStripItem title="Players" automationText="playersTabNavigation"></TabStripItem>
44
<!-- this tab serves as dummy so the actual teams tab is not loaded by default -->
5-
<TabStripItem title="Dummy"></TabStripItem>
6-
<TabStripItem title="Teams"></TabStripItem>
5+
<TabStripItem title="Dummy" automationText="dummyTabNavigation"></TabStripItem>
6+
<TabStripItem title="Teams" automationText="teamsTabNavigation"></TabStripItem>
77
</TabStrip>
88

99
<TabContentItem>
1010
<GridLayout rows="auto, auto, *">
11-
<Label text="tabs root top home" />
11+
<Label text="tabs root bottom home" />
1212
<Button row="1" text="reset app" tap="onReset" />
1313
<GridLayout row="2">
1414
<Frame defaultPage="players/players-items-page" />

‎e2e/nested-frame-navigation/app/tabs-root/tabs-top-root.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<Tabs tabsPosition="top">
1+
<Tabs tabsPosition="top" automationText="tabNavigation">
22
<TabStrip>
3-
<TabStripItem title="Players"></TabStripItem>
3+
<TabStripItem title="Players" automationText="playersTabNavigation"></TabStripItem>
44
<!-- this tab serves as dummy so the actual teams tab is not loaded by default -->
5-
<TabStripItem title="Dummy"></TabStripItem>
6-
<TabStripItem title="Teams"></TabStripItem>
5+
<TabStripItem title="Dummy" automationText="dummyTabNavigation"></TabStripItem>
6+
<TabStripItem title="Teams" automationText="teamsTabNavigation"></TabStripItem>
77
</TabStrip>
88

99
<TabContentItem>

0 commit comments

Comments
 (0)