From 6685118dfbf502dd7c51abfca33e923bb4952fd8 Mon Sep 17 00:00:00 2001 From: Marinel maxime Date: Fri, 16 Apr 2021 16:17:34 +0200 Subject: [PATCH] Prepare test --- .gitignore | 3 + .swiftlint.yml | 1 + Gemfile | 3 + Gemfile.lock | 202 ++++++++++++ .../Tests/SharedLibTests/BoolTests.swift | 11 + .../Tests/SharedLibTests/DateTests.swift | 9 + .../SharedLibTests/DictionaryTests.swift | 17 + SharedLib/Tests/SharedLibTests/IntTests.swift | 15 + .../Tests/SharedLibTests/SharedLibTests.swift | 5 +- .../Tests/SharedLibTests/StringTests.swift | 68 ++++ SharedLib/Tests/SharedLibTests/URLTests.swift | 8 + Shortcuts/Info.plist | 4 +- Tests iOS/Info.plist | 4 +- Tests iOS/Tests_iOS.swift | 2 +- Tests macOS/Info.plist | 4 +- bagit/Info.plist | 4 +- fastlane/Fastfile | 41 +++ fastlane/README.md | 44 +++ fastlane/Snapfile | 37 +++ fastlane/SnapshotHelper.swift | 305 ++++++++++++++++++ iOS/Info.plist | 4 +- macOS/Info.plist | 4 +- wallabag.xcodeproj/project.pbxproj | 4 +- .../xcschemes/wallabag (iOS).xcscheme | 10 + 24 files changed, 790 insertions(+), 19 deletions(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 SharedLib/Tests/SharedLibTests/BoolTests.swift create mode 100644 SharedLib/Tests/SharedLibTests/DateTests.swift create mode 100644 SharedLib/Tests/SharedLibTests/DictionaryTests.swift create mode 100644 SharedLib/Tests/SharedLibTests/IntTests.swift create mode 100644 SharedLib/Tests/SharedLibTests/StringTests.swift create mode 100644 SharedLib/Tests/SharedLibTests/URLTests.swift create mode 100644 fastlane/Fastfile create mode 100644 fastlane/README.md create mode 100644 fastlane/Snapfile create mode 100644 fastlane/SnapshotHelper.swift diff --git a/.gitignore b/.gitignore index fcbc028..7bab116 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,6 @@ fastlane/metadata/trade_representative_contact_information *.cer *.mobileprovision + +vendor/ +.bundle/ diff --git a/.swiftlint.yml b/.swiftlint.yml index 686e8d7..7013cce 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -13,6 +13,7 @@ excluded: - SnapshotHelper.swift - fastlane/SnapshotHelper.swift - MyPlayground.playground + - vendor line_length: 300 identifier_name: excluded: diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..7a118b4 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "fastlane" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..9125978 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,202 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.3) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + artifactory (3.0.15) + atomos (0.1.3) + aws-eventstream (1.1.1) + aws-partitions (1.444.0) + aws-sdk-core (3.114.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-kms (1.43.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.93.1) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.3) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + claide (1.0.3) + colored (1.2) + colored2 (3.1.2) + commander-fastlane (4.4.6) + highline (~> 1.7.2) + declarative (0.0.20) + digest-crc (0.6.3) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.7.6) + emoji_regex (3.2.2) + excon (0.79.0) + faraday (1.3.0) + faraday-net_http (~> 1.0) + multipart-post (>= 1.2, < 3) + ruby2_keywords + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-net_http (1.0.1) + faraday_middleware (1.0.0) + faraday (~> 1.0) + fastimage (2.2.3) + fastlane (2.180.1) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.3, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored + commander-fastlane (>= 4.4.6, < 5.0.0) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-api-client (>= 0.37.0, < 0.39.0) + google-cloud-storage (>= 1.15.0, < 2.0.0) + highline (>= 1.7.2, < 2.0.0) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (~> 2.0.0) + naturally (~> 2.2) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.3) + simctl (~> 1.6.3) + slack-notifier (>= 2.0.0, < 3.0.0) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3) + gh_inspector (1.1.3) + google-api-client (0.38.0) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.9) + httpclient (>= 2.8.1, < 3.0) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + signet (~> 0.12) + google-apis-core (0.3.0) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.14) + httpclient (>= 2.8.1, < 3.0) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + rexml + signet (~> 0.14) + webrick + google-apis-iamcredentials_v1 (0.3.0) + google-apis-core (~> 0.1) + google-apis-storage_v1 (0.3.0) + google-apis-core (~> 0.1) + google-cloud-core (1.6.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.5.0) + faraday (>= 0.17.3, < 2.0) + google-cloud-errors (1.1.0) + google-cloud-storage (1.31.0) + addressable (~> 2.5) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.1) + google-cloud-core (~> 1.2) + googleauth (~> 0.9) + mini_mime (~> 1.0) + googleauth (0.16.1) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (~> 0.14) + highline (1.7.10) + http-cookie (1.0.3) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.4.0) + json (2.5.1) + jwt (2.2.2) + memoist (0.16.2) + mini_magick (4.11.0) + mini_mime (1.1.0) + multi_json (1.15.0) + multipart-post (2.0.0) + nanaimo (0.3.0) + naturally (2.2.1) + os (1.1.1) + plist (3.6.0) + public_suffix (4.0.6) + rake (13.0.3) + representable (3.1.1) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.5) + rouge (2.0.7) + ruby2_keywords (0.0.4) + rubyzip (2.3.0) + security (0.1.3) + signet (0.15.0) + addressable (~> 2.3) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.8) + CFPropertyList + naturally + slack-notifier (2.3.2) + terminal-notifier (2.0.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + trailblazer-option (0.1.1) + tty-cursor (0.7.1) + tty-screen (0.8.1) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7) + unicode-display_width (1.7.0) + webrick (1.7.0) + word_wrap (1.0.0) + xcodeproj (1.19.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + universal-darwin-20 + +DEPENDENCIES + fastlane + +BUNDLED WITH + 2.2.15 diff --git a/SharedLib/Tests/SharedLibTests/BoolTests.swift b/SharedLib/Tests/SharedLibTests/BoolTests.swift new file mode 100644 index 0000000..55ba864 --- /dev/null +++ b/SharedLib/Tests/SharedLibTests/BoolTests.swift @@ -0,0 +1,11 @@ +import XCTest + +class BoolTests: XCTestCase { + func testTrue() { + XCTAssertEqual(1, true.int) + } + + func testFalse() { + XCTAssertEqual(0, false.int) + } +} diff --git a/SharedLib/Tests/SharedLibTests/DateTests.swift b/SharedLib/Tests/SharedLibTests/DateTests.swift new file mode 100644 index 0000000..ccc5e7b --- /dev/null +++ b/SharedLib/Tests/SharedLibTests/DateTests.swift @@ -0,0 +1,9 @@ +import XCTest + +class DateTests: XCTestCase { + func testDateFromIsoString() { + let date = Date.fromISOString("1977-04-22T01:00:00-05:00") + #warning("Add better test") + XCTAssertTrue(nil != date) + } +} diff --git a/SharedLib/Tests/SharedLibTests/DictionaryTests.swift b/SharedLib/Tests/SharedLibTests/DictionaryTests.swift new file mode 100644 index 0000000..f9c0ad7 --- /dev/null +++ b/SharedLib/Tests/SharedLibTests/DictionaryTests.swift @@ -0,0 +1,17 @@ +import XCTest + +class DictionaryTests: XCTestCase { + func testMerge() { + let dic = ["Key": "Value"] + //let merged = dic.merge(dict: ["OtherKey": "OtherValue"]) + + //XCTAssertEqual(["Key": "Value", "OtherKey": "OtherValue"], merged) + } + + func testMergeWithSameKeyEraseValue() { + let dic = ["Key": "Value"] + //let merged = dic.merge(dict: ["Key": "OtherValue"]) + + //XCTAssertEqual(["Key": "OtherValue"], merged) + } +} diff --git a/SharedLib/Tests/SharedLibTests/IntTests.swift b/SharedLib/Tests/SharedLibTests/IntTests.swift new file mode 100644 index 0000000..33c50e4 --- /dev/null +++ b/SharedLib/Tests/SharedLibTests/IntTests.swift @@ -0,0 +1,15 @@ +import XCTest + +class IntTests: XCTestCase { + func testReadingTime() { + XCTAssertEqual("00:01:00", 1.readingTime) + XCTAssertEqual("00:02:00", 2.readingTime) + XCTAssertEqual("01:01:00", 61.readingTime) + } + + func testBool() { + XCTAssertFalse(0.bool) + XCTAssertTrue(1.bool) + XCTAssertFalse(2.bool) + } +} diff --git a/SharedLib/Tests/SharedLibTests/SharedLibTests.swift b/SharedLib/Tests/SharedLibTests/SharedLibTests.swift index 691d7ef..35ad1e6 100644 --- a/SharedLib/Tests/SharedLibTests/SharedLibTests.swift +++ b/SharedLib/Tests/SharedLibTests/SharedLibTests.swift @@ -3,10 +3,7 @@ import XCTest final class SharedLibTests: XCTestCase { func testExample() { - // This is an example of a functional test case. - // Use XCTAssert and related functions to verify your tests produce the correct - // results. - XCTAssertEqual(SharedLib().text, "Hello, World!") + XCTAssertEqual("Hello, World!", "Hello, World!") } static var allTests = [ diff --git a/SharedLib/Tests/SharedLibTests/StringTests.swift b/SharedLib/Tests/SharedLibTests/StringTests.swift new file mode 100644 index 0000000..3e5fb97 --- /dev/null +++ b/SharedLib/Tests/SharedLibTests/StringTests.swift @@ -0,0 +1,68 @@ +import XCTest + +class StringTests: XCTestCase { + func testDateWithWrongFormatReturnNil() { + XCTAssertNil("".date) + } + + func testDateWithGoodFormatReturnDate() { + let date = "2016-11-10T17:34:20+0100".date + + XCTAssertNotNil(date) + + let components = Calendar.current.dateComponents([.hour, .minute, .second, .day, .month, .year], from: date!) + + XCTAssertEqual(2016, components.year) + XCTAssertEqual(11, components.month) + XCTAssertEqual(10, components.day) + } + + func testUcFirst() { + let string = "test" + + XCTAssertEqual("Test", string.ucFirst) + } + + func testLcFirst() { + let string = "Test" + + XCTAssertEqual("test", string.lcFirst) + } + + func testWithoutHTML() { + XCTAssertEqual("hello world", "

hello world

".withoutHTML) + } + + func testSpeakable() { + let speakable = "

hello world

Second

".speakable + XCTAssertEqual(2, speakable.count) + } + + func testURL() { + XCTAssertNil("".url) + XCTAssertTrue("https://app.wallabag.it".url != nil) + } + + func testIsValidURLFalse() { + XCTAssertFalse("app".isValidURL) + XCTAssertFalse("https://".isValidURL) + } + + func testIsValidURL() { + XCTAssertFalse("app".isValidURL) + XCTAssertTrue("https://app.wallabag.it".isValidURL) + } + + func testIsValidURLWithPort() { + XCTAssertFalse("app".isValidURL) + XCTAssertTrue("https://app.wallabag.it:9000".isValidURL) + } + + func testMD5() { + if #available(iOS 13.0, *) { + XCTAssertEqual("098f6bcd4621d373cade4e832627b4f6", "test".md5) + } else { + // Fallback on earlier versions + } + } +} diff --git a/SharedLib/Tests/SharedLibTests/URLTests.swift b/SharedLib/Tests/SharedLibTests/URLTests.swift new file mode 100644 index 0000000..ebbd29a --- /dev/null +++ b/SharedLib/Tests/SharedLibTests/URLTests.swift @@ -0,0 +1,8 @@ +import XCTest + +class URLTests: XCTestCase { + func testStringLiteral() throws { + let url: URL = "https://github.com/wallabag" + XCTAssertEqual("https://github.com/wallabag", url.absoluteString) + } +} diff --git a/Shortcuts/Info.plist b/Shortcuts/Info.plist index b68efc5..8bf099f 100644 --- a/Shortcuts/Info.plist +++ b/Shortcuts/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + 6.1.0 CFBundleVersion - 1 + 305 NSExtension NSExtensionAttributes diff --git a/Tests iOS/Info.plist b/Tests iOS/Info.plist index 64d65ca..c59e99c 100644 --- a/Tests iOS/Info.plist +++ b/Tests iOS/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + 6.1.0 CFBundleVersion - 1 + 305 diff --git a/Tests iOS/Tests_iOS.swift b/Tests iOS/Tests_iOS.swift index a3134cf..b432921 100644 --- a/Tests iOS/Tests_iOS.swift +++ b/Tests iOS/Tests_iOS.swift @@ -30,7 +30,7 @@ class TestsIOS: XCTestCase { // Use XCTAssert and related functions to verify your tests produce the correct results. } - func testLaunchPerformance() throws { + func atestLaunchPerformance() throws { if #available(macOS 10.15, iOS 13.0, tvOS 13.0, *) { // This measures how long it takes to launch your application. measure(metrics: [XCTApplicationLaunchMetric()]) { diff --git a/Tests macOS/Info.plist b/Tests macOS/Info.plist index 64d65ca..c59e99c 100644 --- a/Tests macOS/Info.plist +++ b/Tests macOS/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + 6.1.0 CFBundleVersion - 1 + 305 diff --git a/bagit/Info.plist b/bagit/Info.plist index 28efc4e..2068587 100644 --- a/bagit/Info.plist +++ b/bagit/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - $(MARKETING_VERSION) + 6.1.0 CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 305 ITSEncryptionExportComplianceCode NSAppTransportSecurity diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 0000000..c0f2153 --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,41 @@ +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools +# +# For a list of all available actions, check out +# +# https://docs.fastlane.tools/actions +# +# For a list of all available plugins, check out +# +# https://docs.fastlane.tools/plugins/available-plugins +# + +# Uncomment the line if you want fastlane to automatically update itself +# update_fastlane + +default_platform(:ios) + +platform :ios do + desc "Generate new localized screenshots" + lane :screenshots do + capture_screenshots(scheme: "wallabag (iOS)") + end + + desc "Set version" + lane :setversion do + version = prompt(text: "Version ?") + increment_version_number( + version_number: version + ) + end + + desc "Increment build number" + lane :incrementbuildnumber do + increment_build_number + end + + desc "Run tests" + lane :test do + run_tests(scheme: "wallabag (iOS)") + end +end diff --git a/fastlane/README.md b/fastlane/README.md new file mode 100644 index 0000000..315fda6 --- /dev/null +++ b/fastlane/README.md @@ -0,0 +1,44 @@ +fastlane documentation +================ +# Installation + +Make sure you have the latest version of the Xcode command line tools installed: + +``` +xcode-select --install +``` + +Install _fastlane_ using +``` +[sudo] gem install fastlane -NV +``` +or alternatively using `brew install fastlane` + +# Available Actions +## iOS +### ios screenshots +``` +fastlane ios screenshots +``` +Generate new localized screenshots +### ios setversion +``` +fastlane ios setversion +``` +Set version +### ios incrementbuildnumber +``` +fastlane ios incrementbuildnumber +``` +Increment build number +### ios test +``` +fastlane ios test +``` +Run tests + +---- + +This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run. +More information about fastlane can be found on [fastlane.tools](https://fastlane.tools). +The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools). diff --git a/fastlane/Snapfile b/fastlane/Snapfile new file mode 100644 index 0000000..a380f78 --- /dev/null +++ b/fastlane/Snapfile @@ -0,0 +1,37 @@ +# Uncomment the lines below you want to change by removing the # in the beginning + +# A list of devices you want to take the screenshots from +# devices([ +# "iPhone 8", +# "iPhone 8 Plus", +# "iPhone SE", +# "iPhone X", +# "iPad Pro (12.9-inch)", +# "iPad Pro (9.7-inch)", +# "Apple TV 1080p" +# ]) + +# languages([ +# "en-US", +# "de-DE", +# "it-IT", +# ["pt", "pt_BR"] # Portuguese with Brazilian locale +# ]) + +# The name of the scheme which contains the UI Tests +# scheme("SchemeName") + +# Where should the resulting screenshots be stored? +# output_directory("./screenshots") + +# remove the '#' to clear all previously generated screenshots before creating new ones +# clear_previous_screenshots(true) + +# Remove the '#' to set the status bar to 9:41 AM, and show full battery and reception. +# override_status_bar(true) + +# Arguments to pass to the app on launch. See https://docs.fastlane.tools/actions/snapshot/#launch-arguments +# launch_arguments(["-favColor red"]) + +# For more information about all available options run +# fastlane action snapshot diff --git a/fastlane/SnapshotHelper.swift b/fastlane/SnapshotHelper.swift new file mode 100644 index 0000000..181e43f --- /dev/null +++ b/fastlane/SnapshotHelper.swift @@ -0,0 +1,305 @@ +// +// SnapshotHelper.swift +// Example +// +// Created by Felix Krause on 10/8/15. +// + +// ----------------------------------------------------- +// IMPORTANT: When modifying this file, make sure to +// increment the version number at the very +// bottom of the file to notify users about +// the new SnapshotHelper.swift +// ----------------------------------------------------- + +import Foundation +import XCTest + +var deviceLanguage = "" +var locale = "" + +func setupSnapshot(_ app: XCUIApplication, waitForAnimations: Bool = true) { + Snapshot.setupSnapshot(app, waitForAnimations: waitForAnimations) +} + +func snapshot(_ name: String, waitForLoadingIndicator: Bool) { + if waitForLoadingIndicator { + Snapshot.snapshot(name) + } else { + Snapshot.snapshot(name, timeWaitingForIdle: 0) + } +} + +/// - Parameters: +/// - name: The name of the snapshot +/// - timeout: Amount of seconds to wait until the network loading indicator disappears. Pass `0` if you don't want to wait. +func snapshot(_ name: String, timeWaitingForIdle timeout: TimeInterval = 20) { + Snapshot.snapshot(name, timeWaitingForIdle: timeout) +} + +enum SnapshotError: Error, CustomDebugStringConvertible { + case cannotFindSimulatorHomeDirectory + case cannotRunOnPhysicalDevice + + var debugDescription: String { + switch self { + case .cannotFindSimulatorHomeDirectory: + return "Couldn't find simulator home location. Please, check SIMULATOR_HOST_HOME env variable." + case .cannotRunOnPhysicalDevice: + return "Can't use Snapshot on a physical device." + } + } +} + +@objcMembers +open class Snapshot: NSObject { + static var app: XCUIApplication? + static var waitForAnimations = true + static var cacheDirectory: URL? + static var screenshotsDirectory: URL? { + return cacheDirectory?.appendingPathComponent("screenshots", isDirectory: true) + } + + open class func setupSnapshot(_ app: XCUIApplication, waitForAnimations: Bool = true) { + + Snapshot.app = app + Snapshot.waitForAnimations = waitForAnimations + + do { + let cacheDir = try getCacheDirectory() + Snapshot.cacheDirectory = cacheDir + setLanguage(app) + setLocale(app) + setLaunchArguments(app) + } catch let error { + NSLog(error.localizedDescription) + } + } + + class func setLanguage(_ app: XCUIApplication) { + guard let cacheDirectory = self.cacheDirectory else { + NSLog("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) + app.launchArguments += ["-AppleLanguages", "(\(deviceLanguage))"] + } catch { + NSLog("Couldn't detect/set language...") + } + } + + class func setLocale(_ app: XCUIApplication) { + guard let cacheDirectory = self.cacheDirectory else { + NSLog("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) + } catch { + NSLog("Couldn't detect/set locale...") + } + + if locale.isEmpty && !deviceLanguage.isEmpty { + locale = Locale(identifier: deviceLanguage).identifier + } + + if !locale.isEmpty { + app.launchArguments += ["-AppleLocale", "\"\(locale)\""] + } + } + + class func setLaunchArguments(_ app: XCUIApplication) { + guard let cacheDirectory = self.cacheDirectory else { + NSLog("CacheDirectory is not set - probably running on a physical device?") + return + } + + 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: []) + let matches = regex.matches(in: launchArguments, options: [], range: NSRange(location: 0, length: launchArguments.count)) + let results = matches.map { result -> String in + (launchArguments as NSString).substring(with: result.range) + } + app.launchArguments += results + } catch { + NSLog("Couldn't detect/set launch_arguments...") + } + } + + open class func snapshot(_ name: String, timeWaitingForIdle timeout: TimeInterval = 20) { + if timeout > 0 { + waitForLoadingIndicatorToDisappear(within: timeout) + } + + NSLog("snapshot: \(name)") // more information about this, check out https://docs.fastlane.tools/actions/snapshot/#how-does-it-work + + if Snapshot.waitForAnimations { + sleep(1) // Waiting for the animation to be finished (kind of) + } + + #if os(OSX) + guard let app = self.app else { + NSLog("XCUIApplication is not set. Please call setupSnapshot(app) before snapshot().") + return + } + + app.typeKey(XCUIKeyboardKeySecondaryFn, modifierFlags: []) + #else + + guard self.app != nil else { + NSLog("XCUIApplication is not set. Please call setupSnapshot(app) before snapshot().") + return + } + + let screenshot = XCUIScreen.main.screenshot() + #if os(iOS) + let image = XCUIDevice.shared.orientation.isLandscape ? fixLandscapeOrientation(image: screenshot.image) : screenshot.image + #else + let image = screenshot.image + #endif + + guard var simulator = ProcessInfo().environment["SIMULATOR_DEVICE_NAME"], let screenshotsDir = screenshotsDirectory else { return } + + do { + // The simulator name contains "Clone X of " inside the screenshot file when running parallelized UI Tests on concurrent devices + let regex = try NSRegularExpression(pattern: "Clone [0-9]+ of ") + let range = NSRange(location: 0, length: simulator.count) + simulator = regex.stringByReplacingMatches(in: simulator, range: range, withTemplate: "") + + let path = screenshotsDir.appendingPathComponent("\(simulator)-\(name).png") + #if swift(<5.0) + UIImagePNGRepresentation(image)?.write(to: path, options: .atomic) + #else + try image.pngData()?.write(to: path, options: .atomic) + #endif + } catch let error { + NSLog("Problem writing screenshot: \(name) to \(screenshotsDir)/\(simulator)-\(name).png") + NSLog(error.localizedDescription) + } + #endif + } + + class func fixLandscapeOrientation(image: UIImage) -> UIImage { + if #available(iOS 10.0, *) { + let format = UIGraphicsImageRendererFormat() + format.scale = image.scale + let renderer = UIGraphicsImageRenderer(size: image.size, format: format) + return renderer.image { context in + image.draw(in: CGRect(x: 0, y: 0, width: image.size.width, height: image.size.height)) + } + } else { + return image + } + } + + class func waitForLoadingIndicatorToDisappear(within timeout: TimeInterval) { + #if os(tvOS) + return + #endif + + guard let app = self.app else { + NSLog("XCUIApplication is not set. Please call setupSnapshot(app) before snapshot().") + return + } + + let networkLoadingIndicator = app.otherElements.deviceStatusBars.networkLoadingIndicators.element + let networkLoadingIndicatorDisappeared = XCTNSPredicateExpectation(predicate: NSPredicate(format: "exists == false"), object: networkLoadingIndicator) + _ = XCTWaiter.wait(for: [networkLoadingIndicatorDisappeared], timeout: timeout) + } + + class func getCacheDirectory() throws -> URL { + let cachePath = "Library/Caches/tools.fastlane" + // on OSX config is stored in /Users//Library + // and on iOS/tvOS/WatchOS it's in simulator's home dir + #if os(OSX) + let homeDir = URL(fileURLWithPath: NSHomeDirectory()) + return homeDir.appendingPathComponent(cachePath) + #elseif arch(i386) || arch(x86_64) || arch(arm64) + guard let simulatorHostHome = ProcessInfo().environment["SIMULATOR_HOST_HOME"] else { + throw SnapshotError.cannotFindSimulatorHomeDirectory + } + let homeDir = URL(fileURLWithPath: simulatorHostHome) + return homeDir.appendingPathComponent(cachePath) + #else + throw SnapshotError.cannotRunOnPhysicalDevice + #endif + } +} + +private extension XCUIElementAttributes { + var isNetworkLoadingIndicator: Bool { + if hasAllowListedIdentifier { 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 hasAllowListedIdentifier: Bool { + let allowListedIdentifiers = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"] + + return allowListedIdentifiers.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) + } +} + +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 { + guard let app = Snapshot.app else { + fatalError("XCUIApplication is not set. Please call setupSnapshot(app) before snapshot().") + } + + let deviceWidth = app.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) + } +} + +private extension CGFloat { + func isBetween(_ numberA: CGFloat, and numberB: CGFloat) -> Bool { + return numberA...numberB ~= self + } +} + +// Please don't remove the lines below +// They are used to detect outdated configuration files +// SnapshotHelperVersion [1.25] diff --git a/iOS/Info.plist b/iOS/Info.plist index efc211a..5cb7783 100644 --- a/iOS/Info.plist +++ b/iOS/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + 6.1.0 CFBundleVersion - 1 + 305 LSRequiresIPhoneOS UIApplicationSceneManifest diff --git a/macOS/Info.plist b/macOS/Info.plist index bacbc56..992dc5f 100644 --- a/macOS/Info.plist +++ b/macOS/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + 6.1.0 CFBundleVersion - 1 + 305 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) diff --git a/wallabag.xcodeproj/project.pbxproj b/wallabag.xcodeproj/project.pbxproj index 2f1ad91..58ebd16 100644 --- a/wallabag.xcodeproj/project.pbxproj +++ b/wallabag.xcodeproj/project.pbxproj @@ -1425,7 +1425,7 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = bagit/bagit.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = G97URPCGB8; INFOPLIST_FILE = bagit/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.4; @@ -1449,7 +1449,7 @@ buildSettings = { CODE_SIGN_ENTITLEMENTS = bagit/bagit.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 305; DEVELOPMENT_TEAM = G97URPCGB8; INFOPLIST_FILE = bagit/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.4; diff --git a/wallabag.xcodeproj/xcshareddata/xcschemes/wallabag (iOS).xcscheme b/wallabag.xcodeproj/xcshareddata/xcschemes/wallabag (iOS).xcscheme index 90e0a4b..7fa7edd 100644 --- a/wallabag.xcodeproj/xcshareddata/xcschemes/wallabag (iOS).xcscheme +++ b/wallabag.xcodeproj/xcshareddata/xcschemes/wallabag (iOS).xcscheme @@ -38,6 +38,16 @@ ReferencedContainer = "container:wallabag.xcodeproj"> + + + +