shoot 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeabb7d1b0a3c562b69bd4176f58fd70efce1f73
-  data.tar.gz: 0826500463dd17d0d1d6258e6bccc728a4db32c0
+  metadata.gz: 4331d59d5b33ac9a34a36c7274543815c9227959
+  data.tar.gz: 4d5a81d84d44a5ce417ff9e7947e4c28b3ba8b8f
 SHA512:
-  metadata.gz: e280c175e5cd57471645f856b68ca74c0d76551edd530d6b4918e9b10c1badd7a355a1fbdacb3b3b3ec4e492d65db6b34ae5f6ac03b0e7ea6c09d34ffa9b2414
-  data.tar.gz: 44fc47dbf6035f462b66f8d20cf47760ffaec6eeff791f0a60b814b431850b277baece61c99c754d96c3625b1a5f1977c9461a51eba02e739ee9daf1482edd84
+  metadata.gz: f56bed5a01c1cc3a3cdc718be79ea17b210dc466f7b933def485766bb20f110ddff156e22efaa29f525c7828e27205886add3027f2233f67909f340aa7212477
+  data.tar.gz: 3ab3a44aa10da24e97b62414b63ca3a2e70a4bde8c87d87124b6b9d087eb02f067a4b8bea4ab93fa739398533735abf5c576b3efd1bdcb3c618618945835420c

data/README.md

@@ -63,10 +63,30 @@ Now run:
 
 	$ shoot scenario my_scenario.rb
 	
-This will run all the methods of MyScenario and generate screenshots for all active browsers.
+This will run all the methods of MyScenario and generate screenshots for all active browsers, at the end of each method.
 
 The resulting images will be saved on <font size="7">	`.screenshots`</font> folder.
 
+If you wanna have multiple shots on each method, use the `shoot` method:
+
+```ruby
+class MyScenario < Shoot::Scenario
+	def login
+		visit "http://url.to.login"
+		shoot(:blank_form)
+		
+		fill_in('user', with: 'john')
+		fill_in('password', with: '1234')
+		shoot(:filled_form)
+		
+		click_button('Login')
+		find('#welcome') # This makes sure it waits before you take another shot
+		shoot(:welcome_page)
+	end
+end
+```
+
+
 If you wanna just test your scenarios, without paying SauceLabs and wasting time with remote connections:
 
 	$ shoot test my_scenario.rb

data/lib/shoot/cli.rb

@@ -66,14 +66,23 @@ module Shoot
 
     no_commands do
       def open_all_screenshots
-        `open .screenshots/*.png`
+        `open #{Dir.glob(".screenshots/**/*.png").join(" ")}`
       end
 
       def run(file, config=nil)
         klass = get_const_from_file(file)
         instance = klass.new(config)
+        puts set_color instance.platform_name, :white, :bold
         klass.instance_methods(false).each do |method|
-          instance.shoot(method)
+          print set_color "  ➥ #{klass}##{method} ... ", :white, :bold
+
+          ok, error = instance.run(method)
+          if ok
+            print set_color "OK\n", :green
+          else
+            print set_color "FAILED\n", :red
+            puts set_color "    ⚠ #{error}", :red
+          end
         end
         instance.ok
       end

data/lib/shoot/scenario.rb

@@ -1,5 +1,7 @@
 require 'selenium-webdriver'
 require 'capybara'
+require 'timeout'
+
 class Shoot::Scenario
   URL = sprintf 'http://%s:%s@hub.browserstack.com/wd/hub',
                 ENV['BROWSERSTACK_USER'],
@@ -24,29 +26,36 @@ class Shoot::Scenario
       Capybara.run_server = false
       @platform_name = :poltergeist
     end
-
-    puts "Running #{platform_name}"
+    Capybara.default_wait_time = 10
     Capybara.current_driver = platform_name
   end
 
-  def shoot(method)
+  def find *args
+    Timeout.timeout(10) do
+      begin
+        super *args
+      rescue
+        retry
+      end
+    end
+  end
+
+  def run(method)
+    @current_method = method
     send(method)
-    Kernel.sleep(1) # Just in case
-    require 'fileutils'
-    FileUtils::mkdir_p '.screenshots'
-    save_screenshot(".screenshots/#{method} #{platform_name}.png")
+    #Kernel.sleep(1) # Just in case
+    shoot(:finish)
+    [true, nil]
   rescue => e
-    puts "FAILED #{method}: #{e.inspect}"
-    save_screenshot(".screenshots/failed #{method} #{platform_name}.png")
+    #puts "FAILED #{method}: #{e.inspect}"
+    shoot(:failed)
+    [false, e]
   end
 
   def ok
-    puts 'OK'
     page.driver.quit
   end
 
-  private
-
   def platform_name
     @platform_name ||= if @platform['device']
                          @platform['device']
@@ -56,6 +65,18 @@ class Shoot::Scenario
                        end
   end
 
+  private
+
+  def shoot(label)
+    directory = ".screenshots/#{platform_name.to_s.gsub(" ", "_")}/#{self.class.name}/#{@current_method}"
+    unless Dir.exist?(directory)
+      require 'fileutils'
+      FileUtils::mkdir_p directory
+    end
+
+    save_screenshot("#{directory}/#{label}.png")
+  end
+
   def config_capabilities # rubocop:disable AbcSize
     @capabilities = Selenium::WebDriver::Remote::Capabilities.new
     @capabilities[:browser] = @platform['browser']

data/lib/shoot/version.rb

@@ -1,3 +1,3 @@
 module Shoot
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/cli_spec.rb

@@ -127,7 +127,7 @@ describe 'Shoot::CLI' do
         def method; end
       end
 
-      allow_any_instance_of(Foo).to receive(:shoot)
+      allow_any_instance_of(Foo).to receive(:run)
       expect_any_instance_of(Foo).to receive(:ok)
 
       allow(cli).to receive(:get_const_from_file).with("foo.rb").and_return(Foo)

data/spec/scenario_spec.rb

@@ -3,7 +3,7 @@ require 'capybara'
 
 describe 'Shoot::Scenario' do
 
-  describe 'shoot' do
+  describe 'run' do
     before do
       allow(Capybara).to receive(:register_driver).with("browser 5.0 os 22.0")
       allow(Capybara).to receive(:current_driver=).with("browser 5.0 os 22.0")
@@ -21,8 +21,8 @@ describe 'Shoot::Scenario' do
       allow(@scenario).to receive(:save_screenshot)
     end
 
-    it 'shoots' do
-      @scenario.shoot(:foo)
+    it 'runs' do
+      @scenario.run(:foo)
       expect(@scenario).to have_received(:foo)
       expect(@scenario).to have_received(:save_screenshot)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoot
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Juan Lulkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,7 +156,6 @@ files:
 - lib/shoot/cli.rb
 - lib/shoot/scenario.rb
 - lib/shoot/version.rb
-- shoot-0.0.2.gem
 - shoot.gemspec
 - spec/cli_spec.rb
 - spec/scenario_spec.rb