Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit d96844c

Browse files
Merge pull request #2011 from NativeScript/merge-master-in-release
Merge master in release
2 parents 83e9f51 + 00668a9 commit d96844c

30 files changed

+35
-11
lines changed
2.94 KB
Loading[フレーム]
1.88 KB
Loading[フレーム]
-26.7 KB
Loading[フレーム]
-38.6 KB
Loading[フレーム]
288 KB
Loading[フレーム]
349 KB
Loading[フレーム]
288 KB
Loading[フレーム]
146 KB
Loading[フレーム]

‎e2e/config/appium.capabilities.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,5 +200,25 @@
200200
"deviceName": "iPhone XR",
201201
"noReset": true,
202202
"fullReset": false
203+
},
204+
"sim.iPhoneXR.ios12": {
205+
"platformName": "iOS",
206+
"platformVersion": "12.0",
207+
"deviceName": "iPhone XR 12",
208+
"noReset": true,
209+
"fullReset": false
210+
},
211+
"sim.iPhoneXR.ios13": {
212+
"platformName": "iOS",
213+
"platformVersion": "13.0",
214+
"deviceName": "iPhone XR 13",
215+
"appiumVersion": "1.15.0",
216+
"noReset": true,
217+
"fullReset": false,
218+
"density": 3,
219+
"offsetPixels": 87,
220+
"app": "",
221+
"idleTimeout": 120,
222+
"automationName": "Appium"
203223
}
204224
}

‎e2e/renderer/e2e/page-router-outlet.e2e-spec.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
} from "nativescript-dev-appium";
88
import { assert } from "chai";
99
import { isSauceLab } from "nativescript-dev-appium/lib/parser";
10+
import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
1011

1112
const QUEUE_WAIT_TIME: number = 600000; // Sometimes SauceLabs threads are not available and the tests wait in a queue to start. Wait 10 min before timeout.
1213

@@ -49,23 +50,23 @@ describe("page-router-outlet-scenario", async function () {
4950
});
5051

5152
it("should not hide action bar by default", async function () {
52-
const screenMatches = await driver.compareScreen("actionBarVisibility-always-default", 5);
53+
const screenMatches = await driver.compareScreen("actionBarVisibility-always-default", 5,50,ImageOptions.pixel);
5354
assert(screenMatches);
5455
});
5556

5657
it("should not hide action bar when hidden by page", async function () {
5758
const hideActionBarButton = await driver.findElementByAutomationText("HideActionBar");
5859
await hideActionBarButton.click();
5960

60-
const screenMatches = await driver.compareScreen("actionBarVisibility-always-hidden", 5);
61+
const screenMatches = await driver.compareScreen("actionBarVisibility-always-hidden", 5,50,ImageOptions.pixel);
6162
assert(screenMatches);
6263
});
6364

6465
it("should not do anything when shown action bar by page", async function () {
6566
const showActionBarButton = await driver.findElementByAutomationText("ShowActionBar");
6667
await showActionBarButton.click();
6768

68-
const screenMatches = await driver.compareScreen("actionBarVisibility-always-shown", 5);
69+
const screenMatches = await driver.compareScreen("actionBarVisibility-always-shown", 5,50,ImageOptions.pixel);
6970
assert(screenMatches);
7071
});
7172
});
@@ -167,21 +168,21 @@ describe("page-router-outlet-scenario", async function () {
167168
});
168169

169170
it("should show action bar by default", async function () {
170-
const screenMatches = await driver.compareScreen("actionBarVisibility-auto-default", 5);
171+
const screenMatches = await driver.compareScreen("actionBarVisibility-auto-default", 5,50,ImageOptions.pixel);
171172
assert(screenMatches);
172173
});
173174

174175
it("should hide action bar when hidden by page", async function () {
175176
const hideActionBarButton = await driver.findElementByAutomationText("HideActionBar");
176177
await hideActionBarButton.click();
177-
const screenMatches = await driver.compareScreen("actionBarVisibility-auto-hidden", 5);
178+
const screenMatches = await driver.compareScreen("actionBarVisibility-auto-hidden", 5,50,ImageOptions.pixel);
178179
assert(screenMatches);
179180
});
180181

181182
it("should show action bar when shown by page", async function () {
182183
const showActionBarButton = await driver.findElementByAutomationText("ShowActionBar");
183184
await showActionBarButton.click();
184-
const screenMatches = await driver.compareScreen("actionBarVisibility-auto-shown", 5);
185+
const screenMatches = await driver.compareScreen("actionBarVisibility-auto-shown", 5,50,ImageOptions.pixel);
185186
assert(screenMatches);
186187
});
187188
});

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /