snapshot 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abb441723ec5d8919da77815f6f0a1b1b4b080ee
-  data.tar.gz: b39ed6ef457d26b551c512f29533efcee29a00d9
+  metadata.gz: 8b7ef10f6e12380310c76e6ced44550c9ae5a2c2
+  data.tar.gz: 120e6691fd0afa1ef2d0adbed6ce688e7ee9c723
 SHA512:
-  metadata.gz: 618a96767d35d67ab98d99088fdd4e66b7d603631973e820c136efaa62f32a9dfff72a59de49bd0ae46badf10c60494137d6eab6c5941d9f3259bb0914e1ab11
-  data.tar.gz: 8b9d135eac10e162c969b75020c1f2cfb7081b90c1fbbbb81d0f7a6c4aec8b9796070b8fe40cad0ed457e53dbd2fe3acab127f43184bba36e35416e750a48699
+  metadata.gz: c2fb55b160f240f56c9ea8ca8ffc9328e025c25d1a7a43ac1fb11d78a362590128b6e7a8f71e8036b097e3c6491eea98854fbe90948bc5a939095cb1a966d1ff
+  data.tar.gz: bd014a18b50266f83502bf9eb8eeb5e0cc4ecc641b5630529c14957bccb0cefa7af7c8d4ef10a0680c79f578e1125487c666c4e4d39c8c66fc79e1aaae15e1d9

data/README.md

@@ -191,7 +191,8 @@ devices([
 languages([
   "en-US",
   "de-DE",
-  "es-ES"
+  "es-ES",
+  ["cmn-Hans", "cmn-Hans_CN"] # you can specify a locale if needed
 ])
 ```
 
@@ -242,6 +243,13 @@ Here is an example for adding a preprocessor macro `SNAPSHOT` and  a custom buil
 custom_build_args "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) SNAPSHOT=1' SNAPSHOT_ENABLE = YES"
 ```
 
+### Custom Args for the run command
+Add a ```custom_run_args``` line to your ```Snapfile``` to add custom arguments to the run command (i.e. the invocation of `instruments`. You can use this to set the value of a specific `NSUserDefaults` key, for example
+
+```ruby
+custom_run_args "-DidViewOnboarding YES"
+```
+
 ### Custom Build Command
 If for some reason, the default build command does not work for your project, you can pass your own build script. The script will be executed **once** before the tests are being run.
 

data/lib/snapshot/runner.rb

@@ -17,13 +17,21 @@ module Snapshot
       FileUtils.rm_rf SnapshotConfig.shared_instance.screenshots_path if SnapshotConfig.shared_instance.clear_previous_screenshots
 
       SnapshotConfig.shared_instance.devices.each do |device|
-        SnapshotConfig.shared_instance.languages.each do |language|
-          reinstall_app(device, language) unless ENV["SNAPSHOT_SKIP_UNINSTALL"]
+        SnapshotConfig.shared_instance.languages.each do |language_item|
+
+          if language_item.instance_of?String
+            language = language_item
+            locale = language_item
+          else
+            (language, locale) = language_item            
+          end
+
+          reinstall_app(device, language, locale) unless ENV["SNAPSHOT_SKIP_UNINSTALL"]
 
           prepare_simulator(device, language)
           
           begin
-            errors.concat(run_tests(device, language))
+            errors.concat(run_tests(device, language, locale))
             counter += copy_screenshots(language)
           rescue => ex
             Helper.log.error(ex)
@@ -72,7 +80,7 @@ module Snapshot
       raise "Could not find simulator '#{name}' to install the app on."
     end
 
-    def reinstall_app(device, language)
+    def reinstall_app(device, language, locale)
 
       app_identifier = ENV["SNAPSHOT_APP_IDENTIFIER"]
       app_identifier ||= @app_identifier
@@ -95,13 +103,13 @@ module Snapshot
       com("xcrun simctl shutdown booted")
     end
 
-    def run_tests(device, language)
-      Helper.log.info "Running tests on #{device} in language #{language}".green
-
+    def run_tests(device, language, locale)
+      Helper.log.info "Running tests on #{device} in language #{language} (locale #{locale})".green
+      
       clean_old_traces
 
       ENV['SNAPSHOT_LANGUAGE'] = language
-      command = generate_test_command(device, language)
+      command = generate_test_command(device, language, locale)
       Helper.log.debug command.yellow
       
       retry_run = false
@@ -145,7 +153,7 @@ module Snapshot
       if retry_run
         Helper.log.error "Instruments tool failed again. Re-trying..."
         sleep 2 # We need enough sleep... that's an instruments bug
-        errors = run_tests(device, language)
+        errors = run_tests(device, language, locale)
       end
 
       return errors
@@ -200,9 +208,10 @@ module Snapshot
       return Dir.glob("#{TRACE_DIR}/**/*.png").count
     end
 
-    def generate_test_command(device, language)
+    def generate_test_command(device, language, locale)
       is_ipad = (device.downcase.include?'ipad')
       script_path = SnapshotConfig.shared_instance.js_file(is_ipad)
+      custom_run_args = SnapshotConfig.shared_instance.custom_run_args || ENV["SNAPSHOT_CUSTOM_RUN_ARGS"] || ''
 
       [
         "instruments",
@@ -213,7 +222,8 @@ module Snapshot
         "-e UIARESULTSPATH '#{TRACE_DIR}'",
         "-e UIASCRIPT '#{script_path}'",
         "-AppleLanguages '(#{language})'",
-        "-AppleLocale '#{language}'" 
+        "-AppleLocale '#{locale}'",
+        custom_run_args,
       ].join(' ')
     end
   end

data/lib/snapshot/snapshot_config.rb

@@ -43,6 +43,9 @@ module Snapshot
     # @return (String) This will be appended to the actual build command
     attr_accessor :custom_build_args
 
+    # @return (String) This will be appended to the run command
+    attr_accessor :custom_run_args
+
     # @return (Hash) All the blocks, which are called on specific actions
     attr_accessor :blocks
 

data/lib/snapshot/snapshot_file.rb

@@ -53,6 +53,9 @@ module Snapshot
         when :custom_build_args
           raise "custom_build_args has to be an String".red unless value.kind_of?String
           @config.custom_build_args = value
+        when :custom_run_args
+          raise "custom_run_args has to be an String".red unless value.kind_of?String
+          @config.custom_run_args = value
         when :skip_alpha_removal
           @config.skip_alpha_removal = true
         when :clear_previous_screenshots

data/lib/snapshot/version.rb

@@ -1,3 +1,3 @@
 module Snapshot
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapshot
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage