acceptance_test 1.10.12 → 1.11.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWRkY2IyYTg2MDEwMTc1ODE2ZTVlMjU2MmJkNmI2ZTQwYzY1YjkyMg==
+    YjgxMjY2N2VjY2FiNjA5MjA3MmRhZmQ3Yzc4NWJkY2UxNmNlNjQ5Zg==
   data.tar.gz: !binary |-
-    MzQ3MDlmNWY3NjcyNTNhMDNiMDY4ODRiN2RhYWVkZjZlNzJiNDI2NQ==
+    ZmMzNTQ1NDc4MjBhNDA1ZGZlMjQ1OTM5NTFlMTE3NGM3NjZmMjZmZA==
 SHA512:
   metadata.gz: !binary |-
-    OTI3MzE0MTdlZTkzNWEzMzI4NzVhYjlkNGNlMTdhZmMyOTY3MDZhNjY3OTdm
-    ZDA1Y2ZhNGI3NjVmOWI5MjgxMmZiYThkMTFmYmFhMTY5NjI0ZmJkNWMxYTNk
-    ZWJjYjE4M2M4ZWM3MzY5OWMxZTc1NDlhYmQ5Y2YxNzdkMDZiYmY=
+    Zjc1ODU4OWRmNTk2MGI5YmIwNjEwNGI5NjJiN2JhNzZlYzZiNGMyMTU2ZDNh
+    ZThjNDhiM2VlNjNmOTdlMmQ2M2IzZmZjMjQzNDI0Y2M1OTAxMDUzNGNkMDI2
+    ZmY3YzhlZTU0YWUwNmIxNDQzMTM5MTdlYjJjNDJmOTNmNjc1OTQ=
   data.tar.gz: !binary |-
-    OTM5YzVlZGFiMzBmMWNjZTk5NmM5ZjQzZWQ0MThhNTUzODE3MjI3YmI0YWM4
-    ZWQ2OWFiNDFiZjAwNGUzYjVkOWFmNmNiZGVjODYyY2U1MjExYjNmOGRjN2Nl
-    ZTk1MjZiM2Q2MmI1YjA0MWFiZGQwNWMzMTgyM2MzMGExZjI0ZDY=
+    NTA2ODJkNzEyYjkyZTJhM2U2ZjYyZDhlZDEyMjQyZTg4MTAyM2NiMzlmMjg1
+    ZjgyZGI5Nzg1MDRiNTJkZTc1YTAwYmYzMDAzZTYzMmY5N2RhM2YwNTUyMTVj
+    NDQ2MWNhYWZiZmQzNWVjYTg1MjljNTU0NjI2M2MzY2FhOWZlYTM=

data/.idea/acceptance_test.iml

@@ -297,7 +297,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="activesupport (v4.2.0, RVM: ruby-1.9.3-p551 [acceptance_test]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, RVM: ruby-1.9.3-p551 [acceptance_test]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.7.6, RVM: ruby-1.9.3-p551 [acceptance_test]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.8.2, RVM: ruby-1.9.3-p551 [acceptance_test]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="capybara (v2.4.4, RVM: ruby-1.9.3-p551 [acceptance_test]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="capybara-firebug (v2.1.0, RVM: ruby-1.9.3-p551 [acceptance_test]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="capybara-webkit (v1.4.1, RVM: ruby-1.9.3-p551 [acceptance_test]) [gem]" level="application" />

data/CHANGES

@@ -309,3 +309,7 @@
 
 * Bug fixes
 
+== Versions 1.11.0
+
+* Refactoring classes
+

data/lib/acceptance_test/acceptance_config.rb

@@ -10,15 +10,21 @@ require 'gnawrnip'
 class AcceptanceConfig
   include Singleton
 
-  def configure workspace, app_name=nil
-    @app_name = app_name
+  def configure workspace, params
+    @app_name = params[:app_name]
 
     support_dirs = load_code_from_support workspace
     load_steps support_dirs
 
     acceptance_test = AcceptanceTest.instance
 
-    acceptance_test.enable_external_source data_reader # enable external source for gherkin
+    if params[:enable_external_source]
+      data_reader = params[:data_reader] ? params[:data_reader] : default_data_reader
+
+      acceptance_test.enable_external_source data_reader # enable external source for gherkin
+    end
+
+    acceptance_test.ignore_case_in_steps if params[:ignore_case_in_steps]
 
     acceptance_config = acceptance_config_file ? HashWithIndifferentAccess.new(YAML.load_file(acceptance_config_file)) : {}
     acceptance_test.configure(acceptance_config)
@@ -28,7 +34,7 @@ class AcceptanceConfig
     end
 
     RSpec.configure do |config|
-      configure_turnip
+      acceptance_test.configure_turnip turnip_report_file, turnip_report_name
 
       config.before(:type => :feature) do |example|
         acceptance_test.setup page, example.metadata
@@ -82,6 +88,14 @@ class AcceptanceConfig
     detect_file(results_dir, "#{app_name}.#{format}")
   end
 
+  def turnip_report_file
+    File.expand_path("tmp/" + (app_name ? "#{app_name}-acceptance-report.html" : "acceptance-report.html"))
+  end
+
+  def turnip_report_name
+    "#{app_name[0].upcase+app_name[1..-1]} Acceptance"
+  end
+
   def webapp_url name=:webapp_url
     AcceptanceTest.instance.config[name]
   end
@@ -106,44 +120,23 @@ class AcceptanceConfig
     !!(AcceptanceTest.instance.config[:webapp_url] =~ /localhost/)
   end
 
-  private
-
-  def configure_turnip
-    report_file = turnip_report_file(app_name)
-
-    configure_turnip_formatter report_file, app_name
-
-    configure_gnawrnip
-  end
-
-  def configure_turnip_formatter report_file, report_name
-    require 'turnip_formatter'
+  def default_data_reader
+    lambda do |source_path|
+      path = acceptance_data_file detect_file_from_script(source_path)
 
-    RSpec.configure do |config|
-      config.add_formatter RSpecTurnipFormatter, report_file
-    end
+      puts "Reading data from: #{path}"
 
-    TurnipFormatter.configure do |config|
-      config.title = "#{report_name[0].upcase+report_name[1..-1]} Acceptance"
-    end
-  end
+      ext = File.extname(path)
 
-  def configure_gnawrnip
-    Gnawrnip.configure do |c|
-      c.make_animation = true
-      c.max_frame_size = 1024 # pixel
+      if ext == '.csv'
+        CSV.read(File.expand_path(path))
+      elsif ext == '.yml'
+        YAML.load_file(File.expand_path(path))
+      end
     end
-
-    Gnawrnip.ready!
   end
 
-  def turnip_report_file name=nil
-    name = ENV['TURNIP_REPORT_PREFIX'] if ENV['TURNIP_REPORT_PREFIX']
-
-    file_name = name.nil? ? "acceptance-report.html" : "#{name}-acceptance-report.html"
-
-    File.expand_path("tmp/#{file_name}")
-  end
+  private
 
   def load_code_from_support basedir
     support_dirs = []
@@ -182,22 +175,6 @@ class AcceptanceConfig
     File.exist?(full_path1) ? full_path1 : full_path2
   end
 
-  def data_reader
-    lambda do |source_path|
-      path = acceptance_data_file detect_file_from_script(source_path)
-
-      puts "Reading data from: #{path}"
-
-      ext = File.extname(path)
-
-      if ext == '.csv'
-        CSV.read(File.expand_path(path))
-      elsif ext == '.yml'
-        YAML.load_file(File.expand_path(path))
-      end
-    end
-  end
-
   def detect_file_from_script source_path
     path = source_path % {acceptance_env: environment, format: format}
 

data/lib/acceptance_test/acceptance_test.rb

@@ -89,6 +89,44 @@ class AcceptanceTest
     GherkinExt.enable_external_source data_reader
   end
 
+  def configure_turnip report_file, title
+    # configure turnip formatter
+
+    require 'turnip_formatter'
+
+    RSpec.configure do |config|
+      config.add_formatter RSpecTurnipFormatter, report_file
+    end
+
+    TurnipFormatter.configure do |config|
+      config.title = title
+    end
+
+    # configure gnawrnip
+
+    Gnawrnip.configure do |c|
+      c.make_animation = true
+      c.max_frame_size = 1024 # pixel
+    end
+
+    Gnawrnip.ready!
+  end
+
+  def ignore_case_in_steps
+    require 'turnip/builder'
+
+    Turnip::Builder::Step.class_eval do
+      def initialize *params
+        description = params[0]
+        first_word = description[0..description.index(/\s/)]
+        first_word = downcase unless ["I ", "(I) "].include?(first_word)
+
+        params[0] = first_word + description[first_word.size..-1].downcase
+        super
+      end
+    end
+  end
+
   private
 
   def driver metadata
@@ -129,17 +167,4 @@ class AcceptanceTest
     ('a'..'z').to_a.shuffle[0, 12].join
   end
 
-  # def self.get_localhost
-  #   orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true  # turn off reverse DNS resolution temporarily
-  #
-  #   UDPSocket.open do |s|
-  #     s.connect '192.168.1.1', 1
-  #     s.addr.last
-  #   end
-  # ensure
-  #   Socket.do_not_reverse_lookup = orig
-  # end
-
-  # ip = `ifconfig | grep 'inet ' | grep -v 127.0.0.1 | cut -d ' ' -f2`.strip
-  # Capybara.app_host = http://#{ip}:#{Capybara.server_port}
 end

data/lib/acceptance_test/version.rb

@@ -1,3 +1,3 @@
 class AcceptanceTest
-  VERSION = "1.10.12"
+  VERSION = "1.11.0"
 end

data/spec/spec_helper.rb

@@ -3,7 +3,9 @@ require 'acceptance_test/acceptance_config'
 ENV['CONFIG_DIR'] = "spec/wikipedia"
 ENV['DATA_DIR'] = "spec/wikipedia/acceptance_data"
 
-AcceptanceConfig.instance.configure "spec", "wikipedia"
+AcceptanceConfig.instance.configure "spec", app_name: "wikipedia",
+                                    enable_external_source: true,
+                                    ignore_case_in_steps: true
 
 RSpec.configure do |c|
   # c.add_formatter 'progress'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acceptance_test
 version: !ruby/object:Gem::Version
-  version: 1.10.12
+  version: 1.11.0
 platform: ruby
 authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Simplifies congiguration and run of acceptance tests.