Skip to content

Commit 09d3709

Browse files
SvetoslavTsenovSvetoslavTsenov
authored
Merge pull request #7621 from NativeScript/svetoslavtsenov/merge-release-in-master-6.0.4
chore: merge release in master 6.0.4
2 parents c2b1d5a + 56fc3e1 commit 09d3709

44 files changed

Lines changed: 417 additions & 173 deletions

Some content is hidden

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

‎CHANGELOG.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
<a name="6.0.4"></a>
2+
## [6.0.4](https://github.com/NativeScript/NativeScript/compare/6.0.3...6.0.4) (2019-07-30)
3+
4+
5+
### Bug Fixes
6+
7+
* **ios:** 'ui/tabs' not found for element 'Tabs'
8+
9+
10+
<a name="6.0.3"></a>
11+
## [6.0.3](https://github.com/NativeScript/NativeScript/compare/6.0.2...6.0.3) (2019-07-29)
12+
13+
14+
### Bug Fixes
15+
16+
* **ios:** move material design dependency to podfile ([#7592](https://github.com/NativeScript/NativeScript/issues/7592)) ([291e3b4](https://github.com/NativeScript/NativeScript/commit/291e3b4))
17+
18+
19+
20+
<a name="6.0.2"></a>
21+
## [6.0.2](https://github.com/NativeScript/NativeScript/compare/6.0.0...6.0.2) (2019-07-26)
22+
23+
24+
### Bug Fixes
25+
26+
* **android:** remove wait for doubletap if no gesture recognizer ([#7584](https://github.com/NativeScript/NativeScript/issues/7584)) ([9fd5ddc](https://github.com/NativeScript/NativeScript/commit/9fd5ddc))
27+
* **bottom-navigation:** crash when tab selected with no item ([#7527](https://github.com/NativeScript/NativeScript/issues/7527)) ([46c17ca](https://github.com/NativeScript/NativeScript/commit/46c17ca))
28+
* **tabs:** tab bar not visible when nested in layout ([#7544](https://github.com/NativeScript/NativeScript/issues/7544)) ([f00b370](https://github.com/NativeScript/NativeScript/commit/f00b370))
29+
* **tabs-android:** wrong tabStripItem selected ([#7522](https://github.com/NativeScript/NativeScript/issues/7522)) ([ca22ba9](https://github.com/NativeScript/NativeScript/commit/ca22ba9))
30+
* **tabs-ios:** crash when setting tabStripItems through items property ([#7548](https://github.com/NativeScript/NativeScript/issues/7548)) ([4511c76](https://github.com/NativeScript/NativeScript/commit/4511c76))
31+
* **tabs-ios:** unable to return to tab after tab with nested frame visited ([#7574](https://github.com/NativeScript/NativeScript/issues/7574)) ([490cab0](https://github.com/NativeScript/NativeScript/commit/490cab0))
32+
33+
34+
135
<a name="6.0.0"></a>
236
# [6.0.0](https://github.com/NativeScript/NativeScript/compare/5.4.2...6.0.0) (2019-06-28)
337

‎e2e/ui-tests-app/README.md‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
***e2e tests execution***
22

33
1. Local setup
4-
- install appium and all requirments related to how to use `nativescript-dev-appium` plugin
4+
- install appium and all requirments related to `nativescript-dev-appium` plugin usage
55
- download images:
66

7-
```npm run load-images Emulator-Api23-Default```
7+
```npm run load-images Emulator-Api23-Default "iPhone X 12"```
88

99
or load multiple folders:
1010

11-
``` npm run load-images Emulator-Api23-Default Emulator-Google-Api28```
11+
``` npm run load-images Emulator-Api23-Default Emulator-Google-Api28 "iPhone X 12"```
1212

13-
This command will download https://github.com/NativeScript/functional-tests-images/tree/master/uitestsapp and sparse all passed directories [emulator-name|simulator-name] [emulator-name|simulator-name] [emulator-name|simulator-name]
14-
- name your device so that it matches folder name, respectively api level and density of emulators.
13+
or load all folders:
14+
15+
``` npm run load-images all```
16+
17+
This command will download https://github.com/NativeScript/functional-tests-images/tree/master/uitestsapp and sparse all passed directories [emulator-name|simulator-name]
18+
- rename/ create your device so that it matches folder name, respectively api level and density of emulators.
1519

1620
You can also use scripts:
1721

1822
`npm run update-emulators` to update your emulator density.
1923

2024
If you need to download system image and create emulator use:
2125

22-
`npm run update-emulators -u`
26+
`npm run update-emulators -- --update-system-images`
2327
2. Test execution
2428
- Run test compilation in separate terminal and don't kill it.
2529

@@ -31,8 +35,8 @@
3135
3. Debug test.
3236
- Run:
3337

34-
`npm run test-debug [android|ios]`
35-
in separate console and don't kill it. This command will start appium server and driver and use the installed app on the device but it will not execute tests.
38+
`npm run e2e-debug [android|ios]`
39+
run in separate console and don't kill it. This command will start appium server and driver and use the installed app on the device but it will not execute tests.
3640
- Go to vs code debugging and use a config like:
3741

3842
```
@@ -48,13 +52,15 @@ in separate console and don't kill it. This command will start appium server and
4852
"--opts",
4953
"../config/mocha.opts",
5054
"--attachToDebug",
55+
"--grpe",
56+
"button"
5157
],
5258
"internalConsoleOptions": "openOnSessionStart"
5359
}
5460

5561
***mocha options***
5662

57-
mocha opt file is plased in "../config/mocha.opts".
63+
mocha opt file is located at "../config/mocha.opts".
5864

5965
--timeout 999999
6066
--recursive e2e
@@ -63,4 +69,8 @@ mocha opt file is plased in "../config/mocha.opts".
6369
--exit
6470

6571

66-
- grep particular suites: "--grep=tabs-tab(s-\\w+)-suite"
72+
***grep particular suit or test***
73+
74+
` npm run e2e ios -- --grep=tabs-tab(s-\\w+)-suite`
75+
76+

‎e2e/ui-tests-app/app/action-bar/action-item-position-page.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Page
22
xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo">
33
<Page.actionBar>
4-
<ActionBar>
4+
<ActionBar automationText="actionBar">
55
<ActionItem ios.position="right" tap="{{ change }}">
66
<Button text="{{ text }}" backgroundColor="red" />
77
</ActionItem>

‎e2e/ui-tests-app/app/action-bar/action-view-page.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Page>
22
<Page.actionBar>
3-
<ActionBar>
3+
<ActionBar automationText="actionBar">
44
<ActionBar.actionItems>
55
<ActionItem tap="navigate">
66
<ActionItem.actionView>

‎e2e/ui-tests-app/app/action-bar/all-page.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Page>
22
<Page.actionBar>
3-
<ActionBar title="Page Title" style="background-color: blue; color: yellow;">
3+
<ActionBar title="Page Title" style="background-color: blue; color: yellow;" automationText="actionBar">
44
<NavigationButton text="go back"/>
55
<ActionBar.actionItems>
66
<ActionItem text="ITEM" tap="navigate"/>

‎e2e/ui-tests-app/app/action-bar/background-css-page.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Page>
2-
<ActionBar title="This is RED" class="action" />
2+
<ActionBar title="This is RED" class="action" automationText="actionBar"/>
33
<StackLayout>
44
<Button text="go to cleared page" tap="navigate"/>
55
</StackLayout>

‎e2e/ui-tests-app/app/action-bar/background-page.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Page>
22
<Page.actionBar>
3-
<ActionBar title="Page Title" style="background-color: green;">
3+
<ActionBar title="Page Title" style="background-color: green;" automationText="actionBar">
44
<NavigationButton text="go back"/>
55
<ActionBar.actionItems>
66
<ActionItem text="ITEM" tap="navigate"/>

‎e2e/ui-tests-app/app/action-bar/clean-page.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Page>
22
<Page.actionBar>
3-
<ActionBar title="Page Title">
3+
<ActionBar title="Page Title" automationText="actionBar">
44
<NavigationButton text="go back"/>
55
<ActionBar.actionItems>
66
<ActionItem text="ITEM" tap="navigate"/>

‎e2e/ui-tests-app/app/action-bar/color-page.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Page>
22
<Page.actionBar>
3-
<ActionBar title="Page Title" style="color: green;">
3+
<ActionBar title="Page Title" style="color: green;" automationText="actionBar">
44
<NavigationButton text="go back"/>
55
<ActionBar.actionItems>
66
<ActionItem text="ITEM" tap="navigate"/>

‎e2e/ui-tests-app/app/action-bar/flat-layout-page.xml‎

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

3-
<ActionBar flat="true" backgroundColor="blue">
3+
<ActionBar flat="true" backgroundColor="blue" automationText="actionBar">
44
<Label text="flat action bar"></Label>
55
</ActionBar>
66

0 commit comments

Comments
 (0)