8000 chore: fixes · NativeScript/NativeScript@1252b51 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1252b51

Browse files
SvetoslavTsenovSvetoslavTsenov
committed
chore: fixes
1 parent 2213f26 commit 1252b51

12 files changed

+122
-98
lines changed

‎e2e/ui-tests-app/app/bottom-navigation/fancy-fonts-page.css

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,21 @@ ActionBar {
1010
background-color: aquamarine;
1111
}
1212

13-
BottomNavigation {
14-
background-color: lightgreen;
15-
}
16-
1713
Button {
1814
background-color: lightskyblue;
1915
}
2016

21-
#lastItem {
22-
color: black;
17+
BottomNavigation {
18+
background-color: lightgreen;
2319
}
2420

25-
TabStripItem:active {
26-
background-color: coral;
21+
#lastStripItem {
22+
color: greenyellow;
23+
background-color: black;
2724
}
2825

29-
TabContentItem:active {
30-
background-color: aquamarine;
26+
TabStripItem:active, #lastStripItem:active {
27+
background-color:coral;
3128
}
3229

3330
#second-tab-content-item {

‎e2e/ui-tests-app/app/bottom-navigation/fancy-fonts-page.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<TabStripItem iconSource="res://up" title="ICON-RES"></TabStripItem>
1414

1515
<TabStripItem title="Simply Long Title"></TabStripItem>
16-
17-
<TabStripItem iconSource="res://icon" id="lastItem" title="LAST"></TabStripItem>
16+
17+
<TabStripItem iconSource="res://icon" id="lastStripItem" title="LAST"></TabStripItem>
1818

1919
</TabStrip>
2020
<TabContentItem>

‎e2e/ui-tests-app/app/bottom-navigation/font-page.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Page class="page">
22

3-
<ActionBar title="BottomNavigation color" icon="" class="action-bar">
3+
<ActionBar title="BottomNavigation FONT" icon="" class="action-bar">
44
</ActionBar>
55

6-
<BottomNavigation>
6+
<BottomNavigation automationText="bottomNavigation" >
77
<TabStrip>
88
<TabStripItem title="First" class="special"></TabStripItem>
99
<TabStripItem title="Second"></TabStripItem>

‎e2e/ui-tests-app/app/bottom-navigation/text-transform-page.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Page class="page">
22

3-
<ActionBar title="BottomNavigation color" icon="" class="action-bar">
3+
<ActionBar title="BottomNavigation Text Transform" icon="" class="action-bar">
44
</ActionBar>
55

6-
<BottomNavigation>
6+
<BottomNavigation automationText="bottomNavigation" >
77
<TabStrip>
88
<TabStripItem title="first" class="special"></TabStripItem>
99
<TabStripItem title="second"></TabStripItem>

‎e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ export class ButtonBackgroundPage extends PageObjectBaseModel {
4646
}
4747
}
4848

49-
async executeScenario(imageName: string, button: string) {
49+
async executeScenario(button: string) {
5050
const presenter = await this.testElement();
5151
await this.tapBtn(button);
52-
const result = await this._driver.compareElement(presenter, imageName, 0.01, 5, ImageOptions.percent);
52+
const result = await this._driver.compareElement(presenter, undefined, 0.01, 5, ImageOptions.percent);
5353
assert.isTrue(result);
5454
}
5555
}

‎e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts

Lines changed: 61 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import { AppiumDriver, createDriver, nsCapabilities } from "nativescript-dev-appium";
22
import { ButtonBackgroundPage } from "./button-background-page";
33
import { assert } from "chai";
4-
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
4+
import { setImageName } from "../../../helpers/image-helper";
55

66
const suite = "button";
77
const spec = "background";
8+
const imagePrefix = `${suite}-${spec}`;
89

9-
describe(`${suite}-${spec}-suite`, () => {
10+
describe(`${imagePrefix}-suite`, () => {
1011
let driver: AppiumDriver;
1112
let backgroundPage: ButtonBackgroundPage;
1213

@@ -16,14 +17,15 @@ describe(`${suite}-${spec}-suite`, () => {
1617
await driver.restartApp();
1718
backgroundPage = new ButtonBackgroundPage(driver);
1819
await backgroundPage.initSuite();
20+
driver.imageHelper.options.donNotAppendActualSuffixOnIntialImageCapture = true;
1921
});
2022

2123
after(async function () {
2224
await backgroundPage.endSuite();
2325
});
2426

2527
beforeEach(function () {
26-
driver.imageHelper.testName = this.currentTest.title;
28+
driver.imageHelper.testName = setImageName(suite, spec, this.currentTest.title);
2729
});
2830

2931
afterEach(async function () {
@@ -34,127 +36,126 @@ describe(`${suite}-${spec}-suite`, () => {
3436
}
3537
});
3638

37-
it("background_11", async function () {
39+
it(`${imagePrefix}-init`, async function () {
3840
const presenter = await backgroundPage.testElement();
39-
const result = await driver.compareElement(presenter, "background_11_clean", 0.1, 2);
41+
const result = await driver.compareElement(presenter, `${imagePrefix}-reset`);
4042
assert.isTrue(result);
4143
});
4244

43-
it("background_12", async function () {
44-
await await backgroundPage.executeScenario("background_12", "1");
45+
it(`${imagePrefix}-1`, async function () {
46+
await await backgroundPage.executeScenario("1");
4547
});
4648

47-
it("background_13", async function () {
49+
it(`${imagePrefix}-reset`, async function () {
4850
await backgroundPage.tapResetBtn();
4951
const presenter = await backgroundPage.testElement();
50-
const result = await driver.compareElement(presenter, "background_11_clean");
52+
const result = await driver.compareElement(presenter, `${imagePrefix}-reset`);
5153
assert.isTrue(result);
5254
});
5355

5456
// Border
55-
it("background_21_border", async function () {
56-
// await backgroundPage.navigateBackToSuitMainPage();
57-
await backgroundPage.executeScenario("background_21_border", "21");
57+
it(`${imagePrefix}-21-borders`, async function () {
58+
await backgroundPage.executeScenario("21");
5859
});
5960

60-
it("background_22_border", async function () {
61-
await backgroundPage.executeScenario("background_22_border", "22");
61+
it(`${imagePrefix}-22-borders`, async function () {
62+
await backgroundPage.executeScenario("22");
6263
});
6364

64-
it("background_23_border", async function () {
65-
await backgroundPage.executeScenario("background_23_border", "23");
65+
it(`${imagePrefix}-23-borders`, async function () {
66+
await backgroundPage.executeScenario("23");
6667
});
6768

6869
// Repeat
69-
it("background_31_repeat", async function () {
70-
await backgroundPage.executeScenario("background_31_repeat", "31");
70+
it(`${imagePrefix}-31-repeat`, async function () {
71+
await backgroundPage.executeScenario("31");
7172
});
7273

73-
it("background_32_repeat", async function () {
74-
await backgroundPage.executeScenario("background_32_repeat", "32");
74+
it(`${imagePrefix}-32-repeat`, async function () {
75+
await backgroundPage.executeScenario("32");
7576
});
7677

77-
it("background_33_repeat", async function () {
78-
await backgroundPage.executeScenario("background_33_repeat", "33");
78+
it(`${imagePrefix}-33-repeat`, async function () {
79+
await backgroundPage.executeScenario("33");
7980
});
8081

8182
// Position
82-
it("background_41_position", async function () {
83-
await backgroundPage.executeScenario("background_41_position", "41");
83+
it(`${imagePrefix}-41-position`, async function () {
84+
await backgroundPage.executeScenario("41");
8485
});
8586

86-
it("background_42_position", async function () {
87-
await backgroundPage.executeScenario("background_42_position", "42");
87+
it(`${imagePrefix}-42-position`, async function () {
88+
await backgroundPage.executeScenario("42");
8889
});
8990

90-
it("background_43_position", async function () {
91-
await backgroundPage.executeScenario("background_43_position", "43");
91+
it(`${imagePrefix}-43-position`, async function () {
92+
await backgroundPage.executeScenario("43");
9293
});
9394

94-
it("background_44_position", async function () {
95-
await backgroundPage.executeScenario("background_44_position", "44");
95+
it(`${imagePrefix}-44-position`, async function () {
96+
await backgroundPage.executeScenario("44");
9697
});
9798

98-
it("background_45_position", async function () {
99-
await backgroundPage.executeScenario("background_45_position", "45");
99+
it(`${imagePrefix}-45-position`, async function () {
100+
await backgroundPage.executeScenario("45");
100101
});
101102

102-
it("background_46_position", async function () {
103-
await backgroundPage.executeScenario("background_46_position", "46");
103+
it(`${imagePrefix}-46-position`, async function () {
104+
await backgroundPage.executeScenario("46");
104105
});
105106

106-
it("background_47_position", async function () {
107-
await backgroundPage.executeScenario("background_47_position", "47");
107+
it(`${imagePrefix}-47-position`, async function () {
108+
await backgroundPage.executeScenario("47");
108109
});
109110

110-
it("background_48_position", async function () {
111-
await backgroundPage.executeScenario("background_48_position", "48");
111+
it(`${imagePrefix}-48-position`, async function () {
112+
await backgroundPage.executeScenario("48");
112113
});
113114

114-
it("background_49_position", async function () {
115-
await backgroundPage.executeScenario("background_49_position", "49");
115+
it(`${imagePrefix}-49-position`, async function () {
116+
await backgroundPage.executeScenario("49");
116117
});
117118

118-
it("background_50_position", async function () {
119-
await backgroundPage.executeScenario("background_50_position", "50");
119+
it(`${imagePrefix}-50-position`, async function () {
120+
await backgroundPage.executeScenario("50");
120121
});
121122

122-
it("background_51_position", async function () {
123-
await backgroundPage.executeScenario("background_51_position", "51");
123+
it(`${imagePrefix}-51-position`, async function () {
124+
await backgroundPage.executeScenario("51");
124125
});
125126

126-
it("background_52_position", async function () {
127-
await backgroundPage.executeScenario("background_52_position", "52");
127+
it(`${imagePrefix}-52-position`, async function () {
128+
await backgroundPage.executeScenario("52");
128129
});
129130

130131
// Size
131-
it("background_61_size", async function () {
132-
await backgroundPage.executeScenario("background_61_size", "61");
132+
it(`${imagePrefix}-61-size`, async function () {
133+
await backgroundPage.executeScenario("61");
133134
});
134135

135-
it("background_62_size", async function () {
136-
await backgroundPage.executeScenario("background_62_size", "62");
136+
it(`${imagePrefix}-62-size`, async function () {
137+
await backgroundPage.executeScenario("62");
137138
});
138139

139-
it("background_63_size", async function () {
140-
await backgroundPage.executeScenario("background_63_size", "63");
140+
it(`${imagePrefix}-63-size`, async function () {
141+
await backgroundPage.executeScenario("63");
141142
});
142143

143-
it("background_64_size", async function () {
144-
await backgroundPage.executeScenario("background_64_size", "64");
144+
it(`${imagePrefix}-64-size`, async function () {
145+
await backgroundPage.executeScenario("64");
145146
});
146147

147148
// All
148-
it("background_71_all", async function () {
149-
await backgroundPage.executeScenario("background_71_all", "71");
149+
it(`${imagePrefix}-71-all`, async function () {
150+
await backgroundPage.executeScenario("71");
150151
});
151152

152-
it("background_72_all", async function () {
153-
await backgroundPage.executeScenario("background_72_all", "72");
153+
it(`${imagePrefix}-72-all`, async function () {
154+
await backgroundPage.executeScenario("72");
154155
});
155156

156157
// Antialiasing
157-
it("background_78_antialiasing", async function () {
158-
await backgroundPage.executeScenario("background_78_antialiasing", "78");
158+
it(`${imagePrefix}-78-antialiasing`, async function () {
159+
await backgroundPage.executeScenario("78");
159160
});
160161
});

‎e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-base-page.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ export class BottomNavigationBasePage extends PageObjectBaseModel {
1414
this._driver.imageHelper.options.keepOriginalImageSize = false;
1515
this._driver.imageHelper.options.tolerance = 0;
1616
this._driver.imageHelper.options.toleranceType = ImageOptions.pixel;
17+
// this._driver.imageHelper.options.donNotAppendActualSuffixOnIntialImageCapture = true;
18+
this._driver.imageHelper.options.timeOutSeconds = 7;
1719
}
1820

1921
async init(subSuiteName: string) {

‎e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import { assert } from "chai";
77

88
const suite = "tab-navigation";
99
const spec = "bottom-navigation-css";
10+
const imagePrefix = `${suite}-${spec}`;
1011

11-
describe(`${suite}-${spec}-suite`, async function () {
12+
describe(`${imagePrefix}-suite`, async function () {
1213
let driver: AppiumDriver;
1314
let bottomNavigationBasePage: BottomNavigationBasePage;
1415

@@ -44,6 +45,7 @@ describe(`${suite}-${spec}-suite`, async function () {
4445
const sample = samples[index];
4546
let imageName = `${spec}-${sample.sample.replace(/[^a-z]/ig, "-").replace(/(-+)/ig, "-").replace(/(_+)/ig, "_").replace(/-$/, "")}`;
4647
it(imageName, async function () {
48+
this.skip();
4749
if (driver.platformName === Platform.ANDROID
4850
&& (sample.sample.toLowerCase() === "all"
4951
|| sample.sample.toLowerCase() === "reset")) {

‎e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ describe(`${suite}-${spec}-suite`, async function () {
4747
await bottomNavigationBasePage.refreshBottomNavigationTab();
4848
await bottomNavigationBasePage.tabOnItem(1);
4949
await driver.imageHelper.compareScreen();
50-
50+
5151
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
5252

5353
await bottomNavigationBasePage.navigateBackToSuitMainPage();
@@ -203,7 +203,7 @@ describe(`${suite}-${spec}-suite`, async function () {
203203
await driver.backgroundApp(1);
204204
await driver.imageHelper.compareScreen();
205205

206-
await driver.setOrientation(DeviceOrientaion.PORTRAIT);
206+
// await driver.setOrientation(DeviceOrientaion.PORTRAIT);
207207
await driver.imageHelper.compareScreen();
208208

209209
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
@@ -212,15 +212,11 @@ describe(`${suite}-${spec}-suite`, async function () {
212212

213213
it(`${spec}-icon-change`, async function () {
214214
await bottomNavigationBasePage.navigateToSample("icon-change");
215-
const index = driver.nsCapabilities.device.platform === Platform.IOS
216-
? (+driver.nsCapabilities.device.apiLevel >= 11 ? 2 : 3) : 1;
217-
218-
let btns = await driver.findElementsByClassName(driver.locators.button, 5000);
219-
await btns[index].tap();
215+
await bottomNavigationBasePage.refreshBottomNavigationTab();
216+
await bottomNavigationBasePage.tabOnItem(1);
220217
await driver.imageHelper.compareScreen();
221218

222-
btns = await driver.findElementsByClassName(driver.locators.button, 5000);
223-
await btns[index - 1].tap();
219+
await bottomNavigationBasePage.tabOnItem(0);
224220
await driver.imageHelper.compareScreen();
225221

226222
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
@@ -246,4 +242,28 @@ describe(`${suite}-${spec}-suite`, async function () {
246242
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
247243
await bottomNavigationBasePage.navigateBackToSuitMainPage();
248244
});
245+
246+
it(`${spec}-text-transform`, async function () {
247+
await bottomNavigationBasePage.navigateToSample("text-transform");
248+
await bottomNavigationBasePage.refreshBottomNavigationTab();
249+
await driver.imageHelper.compareScreen();
250+
251+
await bottomNavigationBasePage.tabOnItem(1);
252+
await driver.imageHelper.compareScreen();
253+
254+
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
255+
await bottomNavigationBasePage.navigateBackToSuitMainPage();
256+
});
257+
258+
it(`${spec}-fonts`, async function () {
259+
await bottomNavigationBasePage.navigateToSample("text-transform");
260+
await bottomNavigationBasePage.refreshBottomNavigationTab();
261+
await driver.imageHelper.compareScreen();
262+
263+
await bottomNavigationBasePage.tabOnItem(1);
264+
await driver.imageHelper.compareScreen();
265+
266+
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
267+
await bottomNavigationBasePa 3ECB ge.navigateBackToSuitMainPage();
268+
});
249269
});

0 commit comments

Comments
 (0)
0