Skip to content

Release/2.1.0 #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 46 commits into from
Nov 11, 2019
Merged

Release/2.1.0 #371

Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
e0bd998
Merge branch 'release/2.0.2' into develop
jmoody Oct 21, 2019
d0d5270
improve springboard-alert tools
Oct 21, 2019
10d8711
run on iOS 10
Oct 21, 2019
c0c4650
Commit alerts from iOS 9.3
Oct 21, 2019
8f7e7aa
ROOT_DIR -> XCODE_CORE_SIM_DIR
Oct 21, 2019
9448cc0
update alerts
Oct 21, 2019
9240cd1
Merge pull request #360 from calabash/v-malob/update-location-alerts
jmoody Oct 22, 2019
445f362
Run class-dump
Oct 23, 2019
09c745e
Add missed header
Oct 23, 2019
29bdfb2
Merge pull request #361 from calabash/v-ivnosa/update-private-headers…
jmoody Oct 23, 2019
339c8f8
Dismiss "Allow notifications" alert
AndreyMaslennikov Oct 23, 2019
21a19b7
Merge pull request #362 from calabash/v-andrem/dismiss-allow-notifica…
jmoody Oct 24, 2019
aa35fc3
Add Xcode 11.1 and Xcode 11.2 to the test matrix
MaksimZhukov Oct 24, 2019
84a4810
Remove dangerous SpringBoard alerts
MaksimZhukov Oct 25, 2019
a579eb8
Remove alerts from framework.json
MaksimZhukov Oct 25, 2019
9c99b36
Remove UIApplication_isSpringBoardShowingAnAlert
Oct 25, 2019
cbd7159
Merge pull request #364 from calabash/v-ivnosa/fix-springboard-alerts…
jmoody Oct 28, 2019
c685ad0
Move element resolving logic for different Xcode versions to `cbx_res…
Oct 28, 2019
ff7c6f0
Remove sensitive alerts
MaksimZhukov Oct 28, 2019
d29e5ba
Update frameworks json
MaksimZhukov Oct 28, 2019
7c12438
Merge develop in order to fix Xcode 11.2 tests
MaksimZhukov Oct 28, 2019
8f957c6
Fix SpringBoardAlertsCurrentLanguageTests
MaksimZhukov Oct 28, 2019
dbc37d2
default value
Oct 28, 2019
50a47a7
Remove missed alerts
MaksimZhukov Oct 28, 2019
7ab6fa6
Fix SpringBoardAlertsCurrentLanguageTests
MaksimZhukov Oct 28, 2019
e0df6f7
Change acceptance rules for alerts
vsafonkin Oct 29, 2019
2077acf
Merge pull request #366 from calabash/v-mazhuk/add-xcode-11.1-and-11.…
jmoody Oct 29, 2019
634afba
Merge pull request #363 from calabash/v-mazhuk/remove-dangerous-sprin…
jmoody Oct 29, 2019
bf2497e
Fix zh langs
vsafonkin Oct 29, 2019
f7ce033
Fix unit-tests
vsafonkin Oct 29, 2019
aa01638
Remove missed alert
MaksimZhukov Oct 29, 2019
90ef761
Fix ko lang
vsafonkin Oct 30, 2019
6aaf38c
Fix missing values
vsafonkin Oct 30, 2019
2b3d3e8
Remove missed alert
MaksimZhukov Oct 30, 2019
69f81b9
Fix zh langs
vsafonkin Oct 30, 2019
2642bc3
Fix id lang
vsafonkin Oct 30, 2019
df40aa2
Merge pull request #367 from calabash/v-mazhuk/remove-sensitive-alert…
MaksimZhukov Oct 30, 2019
24f44fa
Merge branch 'develop' into v-vlsafo/changed-acceptance-alert-rules
vsafonkin Oct 30, 2019
cd87cda
Fix unit-tests
vsafonkin Oct 30, 2019
b6b2fc5
Merge pull request #368 from calabash/v-vlsafo/changed-acceptance-ale…
jmoody Oct 30, 2019
c42388a
Parse alerts from xcode 11.2
vsafonkin Oct 30, 2019
1364fed
Merge pull request #369 from calabash/v-vlsafo/parse-alerts-xcode-11.2
jmoody Nov 5, 2019
68b649f
Add missing alerts
vsafonkin Nov 7, 2019
fecd8c3
Merge pull request #370 from calabash/v-vlsafo/add-missing-alerts
vsafonkin Nov 7, 2019
bd217c3
Update server version to 2.1.0
jmoody Nov 11, 2019
b91397a
ado: build release version with Xcode 11.2
jmoody Nov 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix unit-tests
  • Loading branch information
@vsafonkin
vsafonkin committed Oct 30, 2019
commit cd87cda49c51672067e7e754de70f2fa0941be87
4 changes: 2 additions & 2 deletions TestApp/DeviceAgentUnitTests/Utilities/SpringboardAlertsTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ - (void)testAlertTitleUk {
SpringBoardAlerts *alertsArray = [[SpringBoardAlerts alloc] init_private];

NSString *alertTitle = @"«Прiложение» хоче фільтрувати мережевий контент";
NSString *expectedButton = @"Дозволити";
BOOL expectedShouldAccept = YES;
NSString *expectedButton = @"Заборонити";
BOOL expectedShouldAccept = NO;
SpringBoardAlert *actual = [alertsArray alertMatchingTitle:alertTitle];

expect(actual.defaultDismissButtonMarks).to.contain(expectedButton);
Expand Down