Skip to content
This repository has been archived by the owner on Sep 23, 2021. It is now read-only.

Update workflow continuous integration #53

Merged
merged 21 commits into from
Sep 21, 2018
Merged

Update workflow continuous integration #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
359d853
ci(build): use references to build job
Sep 17, 2018
7774977
ci(test): use references to test job
Sep 17, 2018
4996622
ci(deploy): use references to deploy job
Sep 17, 2018
89eae84
ci(release): use references to release job
Sep 17, 2018
4eee306
ci(docs): generate docs independently
Sep 17, 2018
e7bc6bd
ci(docs): generate coverage and test report
Sep 18, 2018
5e5a1b7
ci(fastlane): update fastlane dependency
Sep 18, 2018
1e1b4e5
ci(coverage): run test before coverage
Sep 18, 2018
2105014
ci(fastlane): set locate to utf-8
Sep 18, 2018
d1b7a02
ci(release): generate screenshots app
Sep 20, 2018
98d791c
ci(docs): update cache version gh-pages
Sep 20, 2018
40e7cca
ci(release): send beta version to test fligth
Sep 20, 2018
914f0e6
ci(screenshots): update fastlane snapshot
Sep 20, 2018
ed31e8b
ci(deploy): remove develop deploy old
Sep 20, 2018
a04ee8d
ci(release): generate release and publish app
Sep 20, 2018
7e41127
ci(release): validate run release
Sep 21, 2018
7b32ac6
ci(release): update master branch after release
Sep 21, 2018
bb78819
ci(release): update develop branch after release
Sep 21, 2018
1fb6133
ci(deploy): set script location to update app info
Sep 21, 2018
8636edf
ci(deploy): remove master deploy old
Sep 21, 2018
c305ffd
docs(license): update header license
Sep 21, 2018
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
370 changes: 260 additions & 110 deletions .circleci/config.yml
View file
Open in desktop

Large diffs are not rendered by default.

73 changes: 34 additions & 39 deletions FlyveMDMAdminDashboardUITests/SnapshotHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// Example
//
// Created by Felix Krause on 10/8/15.
// Copyright © 2015 Felix Krause. All rights reserved.
//

// -----------------------------------------------------
Expand Down Expand Up @@ -44,7 +43,7 @@ enum SnapshotError: Error, CustomDebugStringConvertible {
case cannotFindSimulatorHomeDirectory
case cannotAccessSimulatorHomeDirectory(String)
case cannotRunOnPhysicalDevice

var debugDescription: String {
switch self {
case .cannotDetectUser:
Expand All @@ -68,11 +67,11 @@ open class Snapshot: NSObject {
static var screenshotsDirectory: URL? {
return cacheDirectory?.appendingPathComponent("screenshots", isDirectory: true)
}

open class func setupSnapshot(_ app: XCUIApplication) {

Snapshot.app = app

do {
let cacheDir = try pathPrefix()
Snapshot.cacheDirectory = cacheDir
Expand All @@ -83,15 +82,15 @@ open class Snapshot: NSObject {
print(error)
}
}

class func setLanguage(_ app: XCUIApplication) {
guard let cacheDirectory = self.cacheDirectory else {
print("CacheDirectory is not set - probably running on a physical device?")
return
}

let path = cacheDirectory.appendingPathComponent("language.txt")

do {
let trimCharacterSet = CharacterSet.whitespacesAndNewlines
deviceLanguage = try String(contentsOf: path, encoding: .utf8).trimmingCharacters(in: trimCharacterSet)
Expand All @@ -100,15 +99,15 @@ open class Snapshot: NSObject {
print("Couldn't detect/set language...")
}
}

class func setLocale(_ app: XCUIApplication) {
guard let cacheDirectory = self.cacheDirectory else {
print("CacheDirectory is not set - probably running on a physical device?")
return
}

let path = cacheDirectory.appendingPathComponent("locale.txt")

do {
let trimCharacterSet = CharacterSet.whitespacesAndNewlines
locale = try String(contentsOf: path, encoding: .utf8).trimmingCharacters(in: trimCharacterSet)
Expand All @@ -120,7 +119,7 @@ open class Snapshot: NSObject {
}
app.launchArguments += ["-AppleLocale", "\"\(locale)\""]
}

class func setLaunchArguments(_ app: XCUIApplication) {
guard let cacheDirectory = self.cacheDirectory else {
print("CacheDirectory is not set - probably running on a physical device?")
Expand All @@ -129,7 +128,7 @@ open class Snapshot: NSObject {

let path = cacheDirectory.appendingPathComponent("snapshot-launch_arguments.txt")
app.launchArguments += ["-FASTLANE_SNAPSHOT", "YES", "-ui_testing"]

do {
let launchArguments = try String(contentsOf: path, encoding: String.Encoding.utf8)
let regex = try NSRegularExpression(pattern: "(\\\".+?\\\"|\\S+)", options: [])
Expand All @@ -142,16 +141,16 @@ open class Snapshot: NSObject {
print("Couldn't detect/set launch_arguments...")
}
}

open class func snapshot(_ name: String, timeWaitingForIdle timeout: TimeInterval = 20) {
if timeout > 0 {
waitForLoadingIndicatorToDisappear(within: timeout)
}

print("snapshot: \(name)") // more information about this, check out https://docs.fastlane.tools/actions/snapshot/#how-does-it-work

sleep(1) // Waiting for the animation to be finished (kind of)

#if os(OSX)
XCUIApplication().typeKey(XCUIKeyboardKeySecondaryFn, modifierFlags: [])
#else
Expand All @@ -161,11 +160,7 @@ open class Snapshot: NSObject {
return
}

guard let window = app.windows.allElementsBoundByIndex.first(where: { $0.frame.isEmpty == false }) else {
print("Couldn't find an element window in XCUIApplication with a non-empty frame.")
return
}

let window = app.windows.firstMatch
let screenshot = window.screenshot()
guard let simulator = ProcessInfo().environment["SIMULATOR_DEVICE_NAME"], let screenshotsDir = screenshotsDirectory else { return }
let path = screenshotsDir.appendingPathComponent("\(simulator)-\(name).png")
Expand All @@ -177,17 +172,17 @@ open class Snapshot: NSObject {
}
#endif
}

class func waitForLoadingIndicatorToDisappear(within timeout: TimeInterval) {
#if os(tvOS)
return
#endif

let networkLoadingIndicator = XCUIApplication().otherElements.deviceStatusBars.networkLoadingIndicators.element
let networkLoadingIndicatorDisappeared = XCTNSPredicateExpectation(predicate: NSPredicate(format: "exists == false"), object: networkLoadingIndicator)
_ = XCTWaiter.wait(for: [networkLoadingIndicatorDisappeared], timeout: timeout)
}

class func pathPrefix() throws -> URL? {
let homeDir: URL
// on OSX config is stored in /Users/<username>/Library
Expand All @@ -196,11 +191,11 @@ open class Snapshot: NSObject {
guard let user = ProcessInfo().environment["USER"] else {
throw SnapshotError.cannotDetectUser
}

guard let usersDir = FileManager.default.urls(for: .userDirectory, in: .localDomainMask).first else {
throw SnapshotError.cannotFindHomeDirectory
}

homeDir = usersDir.appendingPathComponent(user)
#else
#if arch(i386) || arch(x86_64)
Expand All @@ -222,26 +217,26 @@ open class Snapshot: NSObject {
private extension XCUIElementAttributes {
var isNetworkLoadingIndicator: Bool {
if hasWhiteListedIdentifier { return false }

let hasOldLoadingIndicatorSize = frame.size == CGSize(width: 10, height: 20)
let hasNewLoadingIndicatorSize = frame.size.width.isBetween(46, and: 47) && frame.size.height.isBetween(2, and: 3)

return hasOldLoadingIndicatorSize || hasNewLoadingIndicatorSize
}

var hasWhiteListedIdentifier: Bool {
let whiteListedIdentifiers = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"]

return whiteListedIdentifiers.contains(identifier)
}

func isStatusBar(_ deviceWidth: CGFloat) -> Bool {
if elementType == .statusBar { return true }
guard frame.origin == .zero else { return false }

let oldStatusBarSize = CGSize(width: deviceWidth, height: 20)
let newStatusBarSize = CGSize(width: deviceWidth, height: 44)

return [oldStatusBarSize, newStatusBarSize].contains(frame.size)
}
}
Expand All @@ -250,22 +245,22 @@ private extension XCUIElementQuery {
var networkLoadingIndicators: XCUIElementQuery {
let isNetworkLoadingIndicator = NSPredicate { (evaluatedObject, _) in
guard let element = evaluatedObject as? XCUIElementAttributes else { return false }

return element.isNetworkLoadingIndicator
}

return self.containing(isNetworkLoadingIndicator)
}

var deviceStatusBars: XCUIElementQuery {
let deviceWidth = XCUIApplication().frame.width
let deviceWidth = XCUIApplication().windows.firstMatch.frame.width

let isStatusBar = NSPredicate { (evaluatedObject, _) in
guard let element = evaluatedObject as? XCUIElementAttributes else { return false }

return element.isStatusBar(deviceWidth)
}

return self.containing(isStatusBar)
}
}
Expand All @@ -278,4 +273,4 @@ private extension CGFloat {

// Please don't remove the lines below
// They are used to detect outdated configuration files
// SnapshotHelperVersion [1.10]
// SnapshotHelperVersion [1.12]
54 changes: 25 additions & 29 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GEM
CFPropertyList (3.0.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
atomos (0.1.2)
atomos (0.1.3)
babosa (1.0.2)
claide (1.0.2)
colored (1.2)
Expand All @@ -18,15 +18,15 @@ GEM
dotenv (2.5.0)
emoji_regex (0.1.1)
excon (0.62.0)
faraday (0.15.2)
faraday (0.15.3)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.3)
fastlane (2.98.0)
fastimage (2.1.4)
fastlane (2.105.1)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
Expand All @@ -41,7 +41,7 @@ GEM
faraday_middleware (~> 0.9)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.21.2, < 0.22.0)
google-api-client (>= 0.21.2, < 0.24.0)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
mini_magick (~> 4.5.1)
Expand All @@ -50,7 +50,7 @@ GEM
multipart-post (~> 2.0.0)
plist (>= 3.1.0, < 4.0.0)
public_suffix (~> 2.0.0)
rubyzip (>= 1.2.1, < 2.0.0)
rubyzip (>= 1.2.2, < 2.0.0)
security (= 0.1.3)
simctl (~> 1.6.3)
slack-notifier (>= 2.0.0, < 3.0.0)
Expand All @@ -59,47 +59,43 @@ GEM
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.5.7, < 2.0.0)
xcpretty (~> 0.2.8)
xcodeproj (>= 1.6.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-xcov_report (1.1.3)
gh_inspector (1.1.3)
google-api-client (0.21.2)
google-api-client (0.23.9)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.5, < 0.7.0)
httpclient (>= 2.8.1, < 3.0)
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
googleauth (0.6.2)
signet (~> 0.9)
googleauth (0.6.6)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
os (~> 0.9)
os (>= 0.9, < 2.0)
signet (~> 0.7)
highline (1.7.10)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
json (2.1.0)
jwt (2.1.0)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
memoist (0.16.0)
mime-types (3.1)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mime-types-data (3.2018.0812)
mini_magick (4.5.1)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nanaimo (0.2.5)
nanaimo (0.2.6)
naturally (2.2.0)
os (0.9.6)
os (1.0.0)
plist (3.4.0)
public_suffix (2.0.5)
representable (3.0.4)
Expand All @@ -108,9 +104,9 @@ GEM
uber (< 0.2.0)
retriable (3.1.2)
rouge (2.0.7)
rubyzip (1.2.1)
rubyzip (1.2.2)
security (0.1.3)
signet (0.8.1)
signet (0.9.2)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
Expand All @@ -122,8 +118,8 @@ GEM
terminal-notifier (1.8.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
tty-cursor (0.5.0)
tty-screen (0.6.4)
tty-cursor (0.6.0)
tty-screen (0.6.5)
tty-spinner (0.8.0)
tty-cursor (>= 0.5.0)
uber (0.1.0)
Expand All @@ -132,19 +128,19 @@ GEM
unf_ext (0.0.7.5)
unicode-display_width (1.4.0)
word_wrap (1.0.0)
xcodeproj (1.5.9)
xcodeproj (1.6.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.2)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.5)
nanaimo (~> 0.2.6)
xcov (1.3.5)
fastlane (>= 2.82.0, < 3.0.0)
multipart-post
slack-notifier
terminal-table
xcodeproj
xcpretty (0.2.8)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.0)
xcpretty (~> 0.2, >= 0.0.7)
Expand All @@ -158,4 +154,4 @@ DEPENDENCIES
xcov (= 1.3.5)

BUNDLED WITH
1.16.2
1.16.5
Loading