Mhurd has submitted this change and it was merged.
Change subject: Fix unit tests - 8.3 is now the current version of the SDK
......................................................................
Fix unit tests - 8.3 is now the current version of the SDK
Fix produce command - work around bug
Update to new report format for xctest
Also Cleanup fastfile and add not test option
Uncrust
Change-Id: If2215902b86d7687c9f4f0129ac4963b8d374aec
---
M Wikipedia/View Controllers/Login/LoginViewController.m
M fastlane/Fastfile
M fastlane/lib/utils.rb
3 files changed, 44 insertions(+), 39 deletions(-)
Approvals:
Mhurd: Looks good to me, approved
Bgerstle: Looks good to me, but someone else must approve
diff --git a/Wikipedia/View Controllers/Login/LoginViewController.m
b/Wikipedia/View Controllers/Login/LoginViewController.m
index 8ab7d5d..ec397ec 100644
--- a/Wikipedia/View Controllers/Login/LoginViewController.m
+++ b/Wikipedia/View Controllers/Login/LoginViewController.m
@@ -200,7 +200,7 @@
}
- (void)save {
- id onboardingVC = [self
searchModalsForViewControllerOfClass:[OnboardingViewController class]];
+ id onboardingVC = [self
searchModalsForViewControllerOfClass:[OnboardingViewController class]];
MenuButton* done = (MenuButton*)[self.topMenuViewController
getNavBarItem:NAVBAR_BUTTON_DONE];
done.userInteractionEnabled = NO;
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 5774519..a43ae7a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -37,6 +37,7 @@
produce({
produce_username: 'cfl...@wikimedia.org',
produce_app_identifier: 'org.wikimedia.wikipedia.tfalpha',
+ produce_app_identifier_suffix: '', #work around for:
https://github.com/KrauseFx/produce/issues/27
produce_app_name: 'Wikipedia Alpha',
produce_language: 'English',
produce_version: '4.1.1',
@@ -54,12 +55,8 @@
# verbose: nil, # this means 'Do Verbose'.
})
- unless deploy_disabled?
+ deploy_testflight_build
- ENV['HOCKEY_API_TOKEN'] = 'c881c19fd8d0401682c4640b7948ef5e'
- deploy_testflight_build
-
- end
end
lane :beta do
@@ -95,12 +92,8 @@
archive: nil
})
- unless deploy_disabled?
+ deploy_testflight_build
- ENV['HOCKEY_API_TOKEN'] = 'c881c19fd8d0401682c4640b7948ef5e'
- deploy_testflight_build
-
- end
end
lane :appstore do
@@ -117,4 +110,3 @@
# error do |lane, exception|
# end
-
diff --git a/fastlane/lib/utils.rb b/fastlane/lib/utils.rb
index b1289ca..9e23a78 100644
--- a/fastlane/lib/utils.rb
+++ b/fastlane/lib/utils.rb
@@ -2,6 +2,8 @@
require 'git'
+ENV['HOCKEY_API_TOKEN'] = 'c881c19fd8d0401682c4640b7948ef5e'
+
# Returns true if the `NO_RESET` env var is set to 1
def reset_disabled?
ENV['NO_RESET'] == '1'
@@ -12,6 +14,10 @@
ENV['NO_DEPLOY'] == '1'
end
+# Returns true if the `NO_TEST` env var is set to 1
+def test_disabled?
+ ENV['NO_TEST'] == '1'
+end
# Runs goals from the project's Makefile, this requires going up to the
project directory.
# :args: Additional arguments to be passed to `make`.
# Returns The result of the `make` command
@@ -23,13 +29,23 @@
end
def run_unit_tests
- xctest({
- scheme: 'Wikipedia',
- destination: "platform=iOS Simulator,name=iPhone 6,OS=8.2",
- report_formats: [ "html", "junit" ],
- report_path: "build/reports/iOS82/report.xml",
- clean: nil
- })
+
+ unless test_disabled?
+ xctest({
+ scheme: 'Wikipedia',
+ destination: "platform=iOS Simulator,name=iPhone 6,OS=8.3",
+ reports: [{
+ report: "html",
+ output: "build/reports/report.html"
+ },
+ {
+ report: "junit",
+ output: "build/reports/report.xml"
+ }],
+ clean: nil
+ })
+
+ end
end
# Generate a list of commit subjects from `rev` to `HEAD`
@@ -45,27 +61,24 @@
ENV['GIT_COMMIT_LOG'] || ENV['GIT_COMMIT_LOG'] = generate_git_commit_log
end
-def hockey_api_token
- ENV['HOCKEY_API_TOKEN']
-end
-
def deploy_testflight_build
- # Upload the DSYM to Hockey
- hockey({
- api_token: hockey_api_token,
- notes: git_commit_log,
- notify: 0,
- status: 1, #Means do not make available for download
- })
+ unless deploy_disabled?
+ # Upload the DSYM to Hockey
+ hockey({
+ api_token: ENV['HOCKEY_API_TOKEN'],
+ notes: git_commit_log,
+ notify: 0,
+ status: 1, #Means do not make available for download
+ })
- #Set "What To Test" in iTunes Connect for Testflight builds, in the future,
reference tickets instead of git commits
- DELIVER_WHAT_TO_TEST.replace = git_commit_log
- #Set "App Description" in iTunes Connect for Testflight builds, in the
future set a better description
- DELIVER_BETA_DESCRIPTION.replace = git_commit_log
- #Set "Feedback email" in iTunes Connect for Testflight builds
- DELIVER_BETA_FEEDBACK_EMAIL.replace = 'ab...@wikimedia.org'
+ #Set "What To Test" in iTunes Connect for Testflight builds, in the
future, reference tickets instead of git commits
+ DELIVER_WHAT_TO_TEST.replace = git_commit_log
+ #Set "App Description" in iTunes Connect for Testflight builds, in the
future set a better description
+ DELIVER_BETA_DESCRIPTION.replace = git_commit_log
+ #Set "Feedback email" in iTunes Connect for Testflight builds
+ DELIVER_BETA_FEEDBACK_EMAIL.replace = 'ab...@wikimedia.org'
- # Upload the IPA and DSYM to iTunes Connect
- deliver :testflight, :beta, :skip_deploy, :force
+ # Upload the IPA and DSYM to iTunes Connect
+ deliver :testflight, :beta, :skip_deploy, :force
+ end
end
-
--
To view, visit https://gerrit.wikimedia.org/r/204297
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If2215902b86d7687c9f4f0129ac4963b8d374aec
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: Bgerstle <bgers...@wikimedia.org>
Gerrit-Reviewer: Dr0ptp4kt <ab...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
