lapis_lazuli 2.0.1 → 2.1.3

data/lib/lapis_lazuli/world/hooks.rb

@@ -7,112 +7,113 @@
 #
 
 module LapisLazuli
-module WorldModule
-  ##
-  # Module with cucumber hooks
-  #
-  # The module is special in that it does not include other modules. Instead it
-  # always tests whether World responds to a function before calling it.
-  module Hooks
+  module WorldModule
     ##
-    # Add hooks to one of the four queues :before, :after, :start or :end.
-    HOOK_QUEUES = [
-      :before,
-      :after,
-      :start,
+    # Module with cucumber hooks
+    #
+    # The module is special in that it does not include other modules. Instead it
+    # always tests whether World responds to a function before calling it.
+    module Hooks
+      ##
+      # Add hooks to one of the four queues :before, :after, :start or :end.
+      HOOK_QUEUES = [
+        :before,
+        :after,
+        :start,
       # :end # FIXME hard to implement. See issue #13
-    ]
-    def self.add_hook(queue, hook)
-      if not HOOK_QUEUES.include?(queue)
-        raise "Invalid hook queue #{queue}"
-      end
+      ]
 
-      @@hooks ||= {}
-      @@hooks[queue] ||= []
-      @@hooks[queue] << hook
-    end
+      def self.add_hook(queue, hook)
+        if not HOOK_QUEUES.include?(queue)
+          raise "Invalid hook queue #{queue}"
+        end
 
-    ##
-    # Hook invoked in BeforeScenario
-    def before_scenario_hook(cuke_scenario)
-      # Update the scenario informaton
-      if respond_to? :scenario
-        scenario.running = true
-        scenario.update(cuke_scenario)
+        @@hooks ||= {}
+        @@hooks[queue] ||= []
+        @@hooks[queue] << hook
       end
 
-      # Show the name
-      if respond_to? :log
-        log.info("Starting Scenario: #{scenario.id}")
-      end
+      ##
+      # Hook invoked in BeforeScenario
+      def before_scenario_hook(cuke_scenario)
+        # Update the scenario informaton
+        if respond_to? :scenario
+          scenario.running = true
+          scenario.update(cuke_scenario)
+        end
 
-      # Run 'start' queue once.
-      @@started ||= false
-      if not @@started
-        @@started = true
-        run_queue(:start, cuke_scenario)
-      end
+        # Show the name
+        if respond_to? :log
+          log.info("Starting Scenario: #{scenario.id}")
+        end
 
-      # Run 'before' queue
-      run_queue(:before, cuke_scenario)
-    end
+        # Run 'start' queue once.
+        @@started ||= false
+        if not @@started
+          @@started = true
+          run_queue(:start, cuke_scenario)
+        end
 
-    ##
-    # Hook invoked in AfterScenario
-    def after_scenario_hook(cuke_scenario)
-      # Run 'after' queue
-      run_queue(:after, cuke_scenario)
+        # Run 'before' queue
+        run_queue(:before, cuke_scenario)
+      end
 
-      # Run 'end' queue
-      # FIXME hard to implement; see issue #13
+      ##
+      # Hook invoked in AfterScenario
+      def after_scenario_hook(cuke_scenario)
+        # Run 'after' queue
+        run_queue(:after, cuke_scenario)
 
-      # The current scenario has finished
-      if respond_to? :scenario
-        scenario.running = false
-      end
+        # Run 'end' queue
+        # FIXME hard to implement; see issue #13
 
-      # Sleep if needed
-      if respond_to? :config and has_env_or_config?("step_pause_time")
-        sleep env_or_config("step_pause_time")
-      end
+        # The current scenario has finished
+        if respond_to? :scenario
+          scenario.running = false
+        end
+
+        # Sleep if needed
+        if respond_to? :config and has_env_or_config?("step_pause_time")
+          sleep env_or_config("step_pause_time")
+        end
 
-      # Did we fail?
-      if respond_to? :scenario and respond_to? :has_browser? and respond_to? :browser and respond_to? :config
-        if has_browser? and (cuke_scenario.failed? or (scenario.check_browser_errors and browser.has_error?))
-          # Take a screenshot if needed
-          if has_env_or_config?('screenshot_on_failure')
-            if env_or_config("screenshot_scheme") == "new"
-              # Take screenshots on all active browsers
-              LapisLazuli::Browser.browsers.each do |b|
-                fileloc = b.take_screenshot()
+        # Did we fail?
+        if respond_to? :scenario and respond_to? :has_browser? and respond_to? :browser and respond_to? :config
+          if has_browser? and (cuke_scenario.failed? or (scenario.check_browser_errors and browser.has_error?))
+            # Take a screenshot if needed
+            if has_env_or_config?('screenshot_on_failure')
+              if env_or_config("screenshot_scheme") == "new"
+                # Take screenshots on all active browsers
+                LapisLazuli::Browser.browsers.each do |b|
+                  fileloc = b.take_screenshot()
+                end
+              else
+                browser.take_screenshot()
               end
-            else
-              browser.take_screenshot()
             end
           end
         end
-      end
 
-      # Close browser if needed
-      if respond_to? :has_browser? and respond_to? :browser
-        if has_browser?
-          browser.close_after_scenario(cuke_scenario)
+        # Close browser if needed
+        if respond_to? :has_browser? and respond_to? :browser
+          if has_browser?
+            browser.close_after_scenario(cuke_scenario)
+          end
         end
       end
-    end
 
-  private
-    def run_queue(queue, cuke_scenario)
-      @@hooks ||= {}
+      private
+      def run_queue(queue, cuke_scenario)
+        @@hooks ||= {}
 
-      if @@hooks[queue].nil?
-        return
-      end
+        if @@hooks[queue].nil?
+          return
+        end
 
-      @@hooks[queue].each do |hook|
-        self.instance_exec(cuke_scenario, &hook)
+        @@hooks[queue].each do |hook|
+          self.instance_exec(cuke_scenario, &hook)
+        end
       end
-    end
-  end # module Hooks
-end # module WorldModule
+    end # module Hooks
+  end # module WorldModule
 end # module LapisLazuli

data/lib/lapis_lazuli/world/logging.rb

@@ -37,7 +37,7 @@ module WorldModule
         end
 
         # Start the logger with the config filename
-        log_file = "#{dir}#{File::SEPARATOR}#{File.basename(Config.config_file, ".*")}.log"
+        log_file = "#{dir}#{File::SEPARATOR}#{File.basename(Config.config_files[0], ".*")}.log"
         # Or a filename from the environment
         if has_env_or_config?("log_file")
           log_file = env_or_config("log_file")

data/test/config/config.yml

@@ -8,7 +8,7 @@
 
 ################################################################################
 # Set the global variables
-default_env: production                   # defines the environment
+default_env: local                   # defines the environment
 default_device: desktop720                # set the default browser dimensions and/or user agent (See devices.yml)
 screenshots_dir: screenshots              # where to save the screenshots
 screenshots_height: full                  # When 'full' the window will be resized to max height before taking a screenshot
@@ -29,11 +29,12 @@ error_strings:
 
 ################################################################################
 # Environment specific variables
-test:
-
-uat:
+remote:
+  close_browser_after: feature
+  server:
+    url: local_path
 
-production:
+local:
   close_browser_after: feature
   server:
-      url: http://localhost:9090/
+    url: http://localhost:9090/

data/test/config/cucumber.yml

@@ -24,13 +24,11 @@ chrome: BROWSER=chrome
 ie: BROWSER=ie
 safari: BROWSER=safari
 
-################################################################################
-# Listed environments (default is set in config.yml)
-t: TEST_ENV=test -t @t,@test
-test: TEST_ENV=test -t @t,@test
+local: TEST_ENV=local -t @p,@prod
 
-u: TEST_ENV=acceptatie -t @u,@uat
-uat: TEST_ENV=acceptatie -t @u,@uat
+remote: SELENIUM_ENV=remote -t ~@ignore_on_remote TEST_ENV=remote
 
-p: TEST_ENV=production -t @p,@prod
-production: TEST_ENV=production -t @p,@prod
+################################################################################
+# Calliope.pro settings
+calliope_key: API_KEY=
+calliope_import: -p calliope_key -c -f pretty -f calliope_import --out ./results/latest_results.json

data/test/features/bindings.feature

@@ -1,4 +1,4 @@
-@bindings @p
+@bindings @p @ignore_on_remote
 Feature: binding
 When I want to test the Lapis Lazuli library
 I want to run a webserver with some test files

data/test/features/browser.feature

@@ -1,4 +1,4 @@
-@browser @p
+@browser @p @ignore_on_remote
 Feature: Browsers
 When I want to test the Lapis Lazuli library
 And test if I can start a browser with options

data/test/features/step_definitions/interaction_steps.rb

@@ -11,6 +11,9 @@ Given(/^I navigate to the (.*) test page$/) do |page|
   config = "server.url"
   if has_env?(config)
     url = env(config)
+    if url == 'local_path'
+      url = 'file://' + File.expand_path(File.dirname(File.dirname(__FILE__))) + '/../server/www/'
+    end
     browser.goto "#{url}#{page.downcase.gsub(" ", "_")}.html"
   else
     error(:env => config)
@@ -43,9 +46,9 @@ Given(/I click (the|a) (first|last|random|[0-9]+[a-z]+) (.*)$/) do |arg1, index,
 end
 
 
-Given(/^I create a firefox browser named "(.*?)"( with proxy to "(.*?)")$/) do |name, proxy, proxy_url|
+Given(/^I create a firefox browser named "(.*?)"(?: with proxy to "(.*?)")?$/) do |name, proxy_url|
   b = nil
-  if proxy
+  if proxy_url
     log.debug("Starting with profile")
     require 'selenium-webdriver'
     profile = Selenium::WebDriver::Firefox::Profile.new

data/test/features/step_definitions/validation_steps.rb

@@ -126,11 +126,11 @@ Then(/^within (\d+) seconds I should see added elements with matching$/) do |tim
   elems = browser.multi_wait_all(
     :timeout => timeout,
     :condition => :until,
-    :mode => :match_all,
+    :mode => :match_any,
     :groups => ["wait"],
     :selectors => [
       {:tag_name => 'span', :class => /foo/, :text => /foo/},
-      {:tag_name => 'div', :id => 'bar', :html => "bar"}
+      {:tag_name => 'div', :id => 'bar', :text => "bar"}
     ]
   )
   assert (2 == elems.length), "Expected two elements, found #{elems.length}"

data/test/features/support/env.rb

@@ -4,6 +4,7 @@
 # Author: "spriteCloud" <info@spritecloud.com>
 require 'lapis_lazuli'
 require 'lapis_lazuli/cucumber'
+require 'cucumber/calliope_importer'
 
 module TestModule
   def test_func
@@ -11,7 +12,7 @@ module TestModule
   end
 end
 
-LapisLazuli::WorldModule::Config.config_file = "config/config.yml"
+LapisLazuli::WorldModule::Config.add_config "config/config.yml"
 World(LapisLazuli, TestModule)
 
 LapisLazuli::WorldModule::Browser.browser_module(TestModule)
@@ -22,7 +23,27 @@ LapisLazuli.Start do
   print "Lapis Lazuli: #{Gem.loaded_specs['lapis_lazuli'].version}\n"
   print "Selenium webdriver: #{Gem.loaded_specs['selenium-webdriver'].version}\n"
   print "Watir: #{Gem.loaded_specs['watir'].version}\n"
+  print "Cucumber: #{Gem.loaded_specs['cucumber'].version}\n"
   print "---- VERSION INFO ----\n\n"
+
+  if ENV['SELENIUM_ENV'] == 'remote'
+    require 'selenium-webdriver'
+    if ENV['BROWSER'] == 'firefox'
+      remote_url = 'http://selenium__standalone-firefox:4444/wd/hub/'
+      caps = Selenium::WebDriver::Remote::Capabilities.firefox
+    else
+      remote_url = 'http://selenium__standalone-chrome:4444/wd/hub/'
+      caps = Selenium::WebDriver::Remote::Capabilities.chrome
+    end
+    client = Selenium::WebDriver::Remote::Http::Default.new
+    client.timeout = 120
+
+    browser :remote, {desired_capabilities: caps, http_client: client, url: remote_url}
+  end
+
+  ENV['TA_OS'] = RUBY_PLATFORM
+  ENV['TA_PLATFORM'] = "#{browser.driver.browser} #{browser.driver.capabilities.version}"
+  ENV['TA_BUILD'] = "Lapis Lazuli #{Gem.loaded_specs['lapis_lazuli'].version}"
 end
 
 # Transition function from old codebase to new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapis_lazuli
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Onno Steenbergen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,19 +154,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement
@@ -185,16 +205,22 @@ dependencies:
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '4.0'
 description: "\n    LapisLazuli provides cucumber helper functions and scaffolding
   for easier (web)\n    test automation suite development.\n\n    A lot of functionality
   is aimed at dealing better with [Watir](http://watir.com/),\n    such as:\n\n    -
@@ -235,13 +261,18 @@ files:
 - lib/lapis_lazuli/generators/cucumber/template/config/config.yml
 - lib/lapis_lazuli/generators/cucumber/template/config/cucumber.yml
 - lib/lapis_lazuli/generators/cucumber/template/config/devices.yml
-- lib/lapis_lazuli/generators/cucumber/template/features/account.feature
-- lib/lapis_lazuli/generators/cucumber/template/features/example.feature
-- lib/lapis_lazuli/generators/cucumber/template/features/step_definitions/interaction_steps.rb
-- lib/lapis_lazuli/generators/cucumber/template/features/step_definitions/precondition_steps.rb
-- lib/lapis_lazuli/generators/cucumber/template/features/step_definitions/validation_steps.rb
+- lib/lapis_lazuli/generators/cucumber/template/config/users.yml
+- lib/lapis_lazuli/generators/cucumber/template/features/1_basic.feature
+- lib/lapis_lazuli/generators/cucumber/template/features/2_account.feature
+- lib/lapis_lazuli/generators/cucumber/template/features/3_todo_list.feature
+- lib/lapis_lazuli/generators/cucumber/template/features/helpers/authentication_helper.rb
+- lib/lapis_lazuli/generators/cucumber/template/features/helpers/navigation_helper.rb
+- lib/lapis_lazuli/generators/cucumber/template/features/helpers/registration_helper.rb
+- lib/lapis_lazuli/generators/cucumber/template/features/helpers/user_helper.rb
+- lib/lapis_lazuli/generators/cucumber/template/features/step_definitions/account_steps.rb
+- lib/lapis_lazuli/generators/cucumber/template/features/step_definitions/basic_steps.rb
+- lib/lapis_lazuli/generators/cucumber/template/features/step_definitions/todo_steps.rb
 - lib/lapis_lazuli/generators/cucumber/template/features/support/env.rb
-- lib/lapis_lazuli/generators/cucumber/template/features/support/functions.rb
 - lib/lapis_lazuli/generic/assertions.rb
 - lib/lapis_lazuli/generic/xpath.rb
 - lib/lapis_lazuli/options.rb
@@ -287,6 +318,7 @@ files:
 - test/features/timing.feature
 - test/features/variable.feature
 - test/features/xpath.feature
+- test/results/latest_results.json
 - test/server/start.rb
 - test/server/www/button.html
 - test/server/www/error_html.html
@@ -316,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Cucumber helper functions and scaffolding for easier test automation suite
@@ -348,6 +380,7 @@ test_files:
 - test/features/timing.feature
 - test/features/variable.feature
 - test/features/xpath.feature
+- test/results/latest_results.json
 - test/server/start.rb
 - test/server/www/button.html
 - test/server/www/error_html.html