acceptance_test 1.6.0 → 1.6.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWRiYjdjNWFjMTIwNDRlNjU4M2M0ZWM4ODgyYmI3MzZkZjI2MWUyZQ==
+    MDQxNTE3ODg3ODZiOGNkYjUwMWI0MzZhNWU5NzZlYmZhOGJlZDE1ZA==
   data.tar.gz: !binary |-
-    YjczYjJkOGMxODM0ZWQ3YTY5YmIxNmQ4MmZhZTI2NmRjNmFlOWJiZA==
+    OGE3N2Y3ZTg1NDFmYjM3NjE0NTlhMzk1NmU5YWE1MThhMjIwMmRkOA==
 SHA512:
   metadata.gz: !binary |-
-    MDYxNGE0YWJiNzdiMjBhMjRhMzQyMzQ3ZWRlNTQ1ZmU2MzljZjk1Mzc1NTgw
-    MGYxN2M3YTU5ZThhZDM4NDUyMzFhZjM4OWQ2YzgyZTQ2OTNiYTNmNmY3NzZm
-    MTI2ZDlhOTY4YzM4YmVmMTM1NzE3NTJhOWQ5MTcxZWJmNDg2YmM=
+    OWZlOWJmMmY4OTNkNzM3NWZjN2UyNWNkMWRiYTFjYThlNzdkMzlkYjMzNTgz
+    N2QyN2IyZTdlNTMwNDY5NGI4MjExNTM0ZmIwY2I5YTg3YTJiNTkwMGM2ODc3
+    NDc3MGIyMTEwYTcwZDhjYmVjYjk5YTdlZjY5MDlmYzQwZjcwMzA=
   data.tar.gz: !binary |-
-    ZmQ2YTQ0NmU0ZDNhMjIyZjFiYmI1YTg1MjI2Y2Y5NzEzODVjMDYzZjliYjdh
-    ZTZmOWVhNzgzN2E4ZTI4MDYzNTI2NDI5NDU4ZjNjN2Y3Yzk5YWFmMDA5Y2Ix
-    YWU1NmVkNzE4MWNiMjQxNGQ2YmFiN2I4MjU4ZjcxYmNlNGExM2M=
+    MGJmMWVmOGZiOGQzNmEzYzE0ZDZiMTcwMTFlODQ5YzYwYmFhYTdjYzhjMDk3
+    YzY3YjI0YWY1YzMwZGEwOGQzZjhjZjg5NDk0MzdmMzliNjRhZmVmNzEwYTIy
+    OTllZTg0M2QxY2VmNjA3ZGU1ZTMzOTE5YzE3MGJlYzIxNmIxZmI=

data/CHANGES

@@ -139,4 +139,8 @@
 
 == Version 1.6.0
 
-* Refactor the code
+* Refactor the code
+
+== Version 1.6.1
+
+* Bug fixes

data/Gemfile

@@ -8,6 +8,8 @@ end
 group :test do
   gem "mocha", :require => false
   gem "rspec"
+  gem "turnip_formatter"
+  gem "gnawrnip"
 end
 
 group :acceptance_test do

data/Gemfile.lock

@@ -22,6 +22,7 @@ GEM
       json
     childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
+    chunky_png (1.3.1)
     cliver (0.3.2)
     cucumber (1.3.17)
       builder (>= 2.1.2)
@@ -39,6 +40,10 @@ GEM
       file_utils
     gherkin (2.12.2)
       multi_json (~> 1.3)
+    gnawrnip (0.3.1)
+      capybara (~> 2.2)
+      oily_png
+      turnip_formatter (~> 0.3.2)
     i18n (0.6.11)
     json (1.8.1)
     metaclass (0.0.4)
@@ -51,6 +56,8 @@ GEM
     multi_test (0.1.1)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
+    oily_png (1.1.2)
+      chunky_png (~> 1.3.1)
     poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -85,10 +92,19 @@ GEM
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
+    slim (2.0.3)
+      temple (~> 0.6.6)
+      tilt (>= 1.3.3, < 2.1)
+    temple (0.6.8)
     thread_safe (0.3.4)
+    tilt (2.0.1)
     turnip (1.2.4)
       gherkin (>= 2.5)
       rspec (>= 2.14.0, < 4.0)
+    turnip_formatter (0.3.2)
+      rspec (>= 2.14.0, < 4.0)
+      slim
+      turnip (~> 1.2.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     websocket (1.2.1)
@@ -108,6 +124,7 @@ DEPENDENCIES
   debugger-ruby_core_source
   gemcutter
   gemspec_deps_gen
+  gnawrnip
   mocha
   poltergeist (~> 1.5.1)
   rspec
@@ -116,3 +133,4 @@ DEPENDENCIES
   ruby-debug-ide (= 0.4.17)
   selenium-webdriver (~> 2.43.0)
   turnip (~> 1.2.4)
+  turnip_formatter

data/Rakefile

@@ -1,8 +1,13 @@
 #!/usr/bin/env rake
 
+require "rspec/core/rake_task"
+
+include Rake::DSL
+
+load "lib/tasks/rspec.rake"
+
 $LOAD_PATH.unshift File.expand_path("lib", File.dirname(__FILE__))
 
-require "rspec/core/rake_task"
 require "acceptance_test/version"
 require "gemspec_deps_gen/gemspec_deps_gen"
 

data/lib/acceptance_test/acceptance_test.rb

@@ -14,17 +14,15 @@ class AcceptanceTest
 
   def initialize
     @driver_manager = DriverManager.new
-  end
 
-  def configure config={}
-    if config
-      @config = config.kind_of?(HashWithIndifferentAccess) ? config : HashWithIndifferentAccess.new(config)
-    else
-      @config = HashWithIndifferentAccess.new
+    @config = HashWithIndifferentAccess.new
+
+    @config[:browser] = 'firefox'
+    @config[:screenshot_dir] = File.expand_path('tmp')
     end
 
-    @config[:browser] = 'firefox' unless @config[:browser]
-    @config[:screenshot_dir] = File.expand_path('tmp') unless @config[:screenshot_dir]
+  def configure hash={}
+    config.merge!(HashWithIndifferentAccess.new(hash))
   end
 
   def setup
@@ -130,6 +128,24 @@ class AcceptanceTest
     GherkinExt.enable_external_source data_reader
   end
 
+  def configure_turnip_formatter report_name
+    require 'turnip/rspec'
+    require 'turnip_formatter'
+    require 'turnip/capybara'
+    require 'gnawrnip'
+
+    RSpec.configure do |config|
+      config.add_formatter RSpecTurnipFormatter, report_name
+      # config.add_formatter 'progress'
+      # config.add_formatter 'documentation'
+    end
+
+    Gnawrnip.configure do |c|
+      c.make_animation = true
+      c.max_frame_size = 1024 # pixel
+    end
+  end
+
   def driver metadata
     driver = ENV['DRIVER'].nil? ? nil : ENV['DRIVER'].to_sym
 

data/lib/acceptance_test/driver_manager.rb

@@ -43,10 +43,12 @@ class DriverManager
             Capybara::Poltergeist::Driver.new(app, { debug: false })
           end
         else
-          if driver_name =~ /remote/
+          if selenium_url
             properties[:browser] = :remote
             properties[:url] = selenium_url
-            properties[:desired_capabilities] = capabilities if capabilities
+            #properties[:desired_capabilities] = capabilities if capabilities
+
+            driver_name = "#{driver_name}_remote"
 
             Capybara.register_driver driver_name do |app|
               Capybara::Selenium::Driver.new(app, properties)

data/lib/acceptance_test/version.rb

@@ -1,3 +1,3 @@
 class AcceptanceTest
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/lib/tasks/rspec.rake

@@ -1,7 +1,20 @@
-namespace :spec do
-  desc 'Run turnip acceptance tests'
-  RSpec::Core::RakeTask.new :turnip do |t|
-    t.pattern = './spec{,/*/**}/*.feature'
-    t.rspec_opts = ['-r turnip/rspec']
+require 'rspec'
+require 'gnawrnip'
+
+namespace :rspec do
+
+  def create_spec_task name, paths
+    pattern = paths.collect {|path| "#{path}/**/*.feature" }
+
+    rspec_opts = "--color -r turnip/rspec "
+
+    desc 'Run turnip acceptance tests'
+    RSpec::Core::RakeTask.new(name) do |t|
+      t.pattern = pattern
+      t.rspec_opts = rspec_opts
+    end
   end
+
+  create_spec_task :"acceptance", %w(spec/features)
+
 end

data/spec/acceptance_config.yml

@@ -1,6 +1,7 @@
 webapp_url: 'http://www.wikipedia.org'
 
-selenium_url: 'http://localhost:4444'
+#selenium_url: 'http://localhost:4444/wd/hub'
+selenium_url: 'http://10.111.74.226:4444/wd/hub'
 
 screenshot_dir: 'tmp'
 

data/spec/turnip_helper.rb

@@ -6,6 +6,11 @@ require 'acceptance_test'
 
 require 'test_helper'
 
+require 'steps/search_with_drivers_steps'
+require 'steps/search_with_pages_steps'
+require 'steps/search_with_examples_from_csv_steps'
+require 'steps/search_with_table_steps'
+
 acceptance_test = AcceptanceTest.instance
 
 # enable external source for gherkin
@@ -14,14 +19,10 @@ data_reader = lambda {|source_path| CSV.read(File.expand_path(source_path)) }
 
 acceptance_test.enable_external_source data_reader
 
-require  'steps/search_with_drivers_steps'
-require  'steps/search_with_pages_steps'
-require  'steps/search_with_examples_from_csv_steps'
-require  'steps/search_with_table_steps'
+acceptance_test.extend_turnip
+acceptance_test.configure_turnip_formatter 'tmp/report.html'
 
 config_name = File.expand_path("spec/acceptance_config.yml")
 config = HashWithIndifferentAccess.new(YAML.load_file(config_name))
 
 acceptance_test.configure config
-
-acceptance_test.extend_turnip

data/spec/wikipedia_search_with_pages_spec.rb

@@ -2,9 +2,46 @@ require 'test_helper'
 
 require 'acceptance_test'
 
-acceptance_test = AcceptanceTest.instance
-acceptance_test.configure({webapp_url: "http://www.wikipedia.org", timeout_in_seconds: 10})
-acceptance_test.configure_rspec
+# acceptance_test = AcceptanceTest.instance
+# acceptance_test.configure({webapp_url: "http://www.wikipedia.org", timeout_in_seconds: 10})
+# acceptance_test.configure_rspec
+
+require "capybara"
+require 'selenium/webdriver'
+
+RSpec.configure do |config|
+  config.include Capybara::DSL
+end
+
+# profile = Selenium::WebDriver::Chrome::Profile.new
+# # profile['download.prompt_for_download'] = false
+# profile['webdriver.chrome.driver'] = "c:\\work\\selenium-server\\chromedriver.exe"
+#
+# # properties[:profile] = profile
+#
+# properties = {}
+# properties[:url] = "http://10.111.74.226:4444/wd/hub"
+# properties[:browser] = :remote
+# properties[:desired_capabilities] = Selenium::WebDriver::Remote::Capabilities.chrome(:profile => profile)
+#
+#
+# # ENV['webdriver.chrome.driver'] = "c:\work\selenium-server\chromedriver.exe"
+# #properties[:desired_capabilities]['webdriver.chrome.driver'] = "c:\work\selenium-server\chromedriver.exe"
+#
+# Capybara.register_driver :selenium_remote do |app|
+#   Capybara::Selenium::Driver.new(app, properties)
+# end
+#
+# Capybara.app_host = "http://www.wikipedia.org"
+# Capybara.default_driver = :selenium_remote
+
+
+Capybara.register_driver :selenium_chrome do |app|
+  Capybara::Selenium::Driver.new(app, browser: :chrome)
+end
+
+Capybara.app_host = "http://www.wikipedia.org"
+Capybara.default_driver = :selenium_chrome
 
 require 'pages/wikipedia_pages'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acceptance_test
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
@@ -97,7 +97,7 @@ files:
 - spec/wikipedia_search_spec.rb
 - spec/wikipedia_search_with_config_spec.rb
 - spec/wikipedia_search_with_pages_spec.rb
-- spec/wikipedia_search_with_steps.rb
+- spec/wikipedia_search_with_steps_spec.rb
 homepage: http://github.com/shvets/acceptance_test
 licenses:
 - MIT
@@ -145,4 +145,4 @@ test_files:
 - spec/wikipedia_search_spec.rb
 - spec/wikipedia_search_with_config_spec.rb
 - spec/wikipedia_search_with_pages_spec.rb
-- spec/wikipedia_search_with_steps.rb
+- spec/wikipedia_search_with_steps_spec.rb