lapis_lazuli 3.0.1 → 3.0.2

data/lib/lapis_lazuli/browser/screenshots.rb

@@ -6,6 +6,9 @@
 # All rights reserved.
 #
 
+require 'cucumber/core/test/case'
+require 'cucumber/core/test/step'
+
 module LapisLazuli
   module BrowserModule
 
@@ -82,10 +85,6 @@ module LapisLazuli
           end
           world.log.debug "Screenshot saved: #{fileloc}"
 
-          # Try to store the screenshot name
-          if world.respond_to? :annotate
-            world.annotate :screenshot => fileloc
-          end
         rescue RuntimeError => e
           world.log.debug "Failed to save screenshot to '#{fileloc}'. Error message #{e.message}"
         end

data/lib/lapis_lazuli/version.rb

@@ -6,5 +6,5 @@
 # All rights reserved.
 #
 module LapisLazuli
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/lib/lapis_lazuli/world/logging.rb

@@ -13,41 +13,42 @@ require "lapis_lazuli/runtime"
 require "lapis_lazuli/world/config"
 
 module LapisLazuli
-module WorldModule
-  ##
-  # Module for easy logging
-  #
-  # Manages the following:
-  #   @log        - TeeLogger instances
-  module Logging
-    include LapisLazuli::WorldModule::Config
-
+  module WorldModule
     ##
-    # Log "singleton"
-    def log
-      return Runtime.instance.set_if(self, :logger) do
-        # Make log directory
-        dir = env_or_config('log_dir')
-        begin
-          Dir.mkdir dir
-        rescue SystemCallError => ex
-          # Swallow this error; it occurs (amongst other situations) when the
-          # directory exists. Checking for an existing directory beforehand is
-          # not concurrency safe.
-        end
+    # Module for easy logging
+    #
+    # Manages the following:
+    #   @log        - TeeLogger instances
+    module Logging
+      include LapisLazuli::WorldModule::Config
 
-        # Start the logger with the config filename
-        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")
-        end
-        l = TeeLogger::TeeLogger.new(log_file)
-        l.level = env_or_config("log_level")
+      ##
+      # Log "singleton"
+      def log(msg = nil)
+        super(msg) if msg
+        return Runtime.instance.set_if(self, :logger) do
+          # Make log directory
+          dir = env_or_config('log_dir')
+          begin
+            Dir.mkdir dir
+          rescue SystemCallError => ex
+            # Swallow this error; it occurs (amongst other situations) when the
+            # directory exists. Checking for an existing directory beforehand is
+            # not concurrency safe.
+          end
 
-        l
+          # Start the logger with the config filename
+          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")
+          end
+          l = TeeLogger::TeeLogger.new(log_file)
+          l.level = env_or_config("log_level")
+
+          l
+        end
       end
-    end
-  end # module Logging
-end # module WorldModule
+    end # module Logging
+  end # module WorldModule
 end # module LapisLazuli

data/test/Gemfile

@@ -5,7 +5,7 @@ gem "lapis_lazuli", path: './../'
 
 
 # Project specific gems
-gem 'watir-scroll'
+gem 'cucumber', '~> 6'
 gem 'xml-simple'
 gem 'mechanize'
 gem 'simplecov'

data/test/features/bindings.feature

@@ -7,14 +7,14 @@ And test if I can parse bindings when starting the browsers
   @bindings_01
   Scenario: bindings_01 - Custom user-agent firefox
     Given I use browser bindings "1"
-    And I navigate to URL "http://whatsmyua.com/"
+    And I navigate to URL "https://www.whatsmyua.info/"
     Then within 2 seconds I should see "CUSTOM-USER-AGENT"
     And I close the browser
 
   @bindings_02
   Scenario: bindings_02 - Custom user-agent chrome
     Given I use browser bindings "2"
-    And I navigate to URL "http://whatsmyua.com/"
+    And I navigate to URL "https://www.whatsmyua.info/"
     Then within 2 seconds I should see "CUSTOM-CHROME-USER-AGENT"
     And I close the browser
 
@@ -22,22 +22,22 @@ And test if I can parse bindings when starting the browsers
   @bindings_03 @maximize_issue
   Scenario: bindings_03 - Custom user-agent chrome
     Given I use browser bindings "3"
-    And I navigate to URL "http://whatsmyua.com/"
+    And I navigate to URL "https://www.whatsmyua.info/"
     Then the browser window size should be "full screen"
     And I close the browser
 
   @bindings_04
   Scenario: bindings_04 - Using a pre-defined device (iphone5)
     Given I restart the browser to device setting "iphone5"
-    When I navigate to URL "http://whatsmyua.com"
-    Then within 2 seconds I should see "CPU iPhone OS 5_0 like Mac OS X"
+    When I navigate to URL "https://www.whatsmyua.info/"
+    Then within 2 seconds I should see "AppleWebKit"
     And the browser window size should be "640x1136"
     And I close the browser
 
   @bindings_05
   Scenario: bindings_05 - Using a pre-defined device (desktop1080)
     Given I restart the browser to device setting "desktop1080"
-    When I navigate to URL "http://whatsmyua.com"
+    When I navigate to URL "https://www.whatsmyua.info/"
     Then within 2 seconds I should see "Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3" disappear
     And the browser window size should be "1920x1080"
     And I close the browser

data/test/features/browser.feature

@@ -1,10 +1,10 @@
-@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
-
-@browser_01
-Scenario: browser_01 - Firefox with proxy
-  When I create a firefox browser named "test" with proxy to "localhost:8008"
-  Then the firefox browser named "test" has a profile
-  Then I close the browser named "test"
+#@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
+#
+#@browser_01
+#Scenario: browser_01 - Firefox with proxy
+#  When I create a firefox browser named "test" with proxy to "localhost:8008"
+#  Then the firefox browser named "test" has a profile
+#  Then I close the browser named "test"

data/test/features/button.feature

@@ -1,8 +1,8 @@
 @button @p
 Feature: Buttons
-  When I want to test the Lapis Lazuli library
-  I want to run a webserver with some test files
-  And execute the each library function that handles buttons.
+When I want to test the Lapis Lazuli library
+I want to run a webserver with some test files
+And execute the each library function that handles buttons.
 
   @button_01
   Scenario: button_01 - Find First
@@ -36,3 +36,4 @@ Feature: Buttons
     Given I navigate to the button test page
     And I click the last button
     Then within 1 seconds I should see "last clicked"
+

data/test/features/step_definitions/interaction_steps.rb

@@ -45,7 +45,6 @@ Given(/I click (the|a) (first|last|random|[0-9]+[a-z]+) (.*)$/) do |arg1, index,
   type_element.click
 end
 
-
 Given(/^I create a firefox browser named "(.*?)"(?: with proxy to "(.*?)")?$/) do |name, proxy_url|
   b = nil
   if proxy_url
@@ -81,14 +80,14 @@ end
 When(/^I wait for (class )?"(.*?)" and name it "(.*?)"$/) do |type, id, name|
   type = 'id' if type.nil? || type.empty?
   type.strip!
-  element = browser.wait(:element => {type.to_sym => id})
+  element = browser.wait(:element => { type.to_sym => id })
   scenario.storage.set(name, element)
 end
 
 When(/^no error should be thrown when waiting for "(.*?)"$/) do |id|
   begin
     elm = browser.wait(
-      :element => {:id => id},
+      :element => { :id => id },
       :timeout => 3,
       :throw => false
     )
@@ -162,7 +161,6 @@ Then(/^I should be able to click the first button by click type (.*?)$/) do |typ
   )
 end
 
-
 Then(/^I should be able to click the first button by force click$/) do
   elem = browser.button(:id => 'first')
   browser.force_click(elem)
@@ -174,7 +172,7 @@ Then(/^I should be able to click the first button by force click$/) do
 end
 
 Given(/^I set environment variable "(.*?)" to "(.*?)"$/) do |var, val|
-  ENV[var]=val
+  ENV[var] = val
 end
 
 Given(/^I annotate a step with (.*?)$/) do |data|
@@ -193,25 +191,16 @@ end
 Given(/^I use browser bindings "(.*?)"$/) do |bindings|
   require 'selenium-webdriver'
   case bindings
-    when '1'
-      profile = Selenium::WebDriver::Firefox::Profile.new
-      profile['general.useragent.override'] = "CUSTOM-USER-AGENT"
-      browser.restart :firefox, profile: profile
-    when '2'
-      switches = %w[--user-agent=CUSTOM-CHROME-USER-AGENT]
-      browser.restart :chrome, :switches => switches
-    when '3'
-      caps = Selenium::WebDriver::Remote::Capabilities.chrome(
-        "chromeOptions" => {
-          "args" => [
-            '--start-maximized'
-          ]
-        }
-      )
-      browser.restart :chrome, desired_capabilities: caps
-      browser.window.maximize
-    else
-      error "Requested binding setup does not exist. Requested #{bindings}"
+  when '1'
+    profile = Selenium::WebDriver::Firefox::Profile.new
+    profile['general.useragent.override'] = "CUSTOM-USER-AGENT"
+    browser.restart :firefox, options: { profile: profile }
+  when '2'
+    browser.restart :chrome, options: { args: ['--user-agent=CUSTOM-CHROME-USER-AGENT'] }
+  when '3'
+    browser.restart :chrome, options: { args: ['--start-maximized'] }
+  else
+    error "Requested binding setup does not exist. Requested #{bindings}"
   end
 end
 

data/test/features/step_definitions/multifind_steps.rb

@@ -21,7 +21,7 @@ Given(/^the user expects an error in a multi_find lookup$/) do
     )
     err = "Expected an error looking for elements with no results."
   rescue RuntimeError => e
-    puts "Caught expected error: #{e.message}"
+    log "Caught expected error: #{e.message}"
   end
   error err unless err.empty?
 end
@@ -86,7 +86,7 @@ Given(/^the user expects an error in a multi_find_all lookup$/) do
     )
     err = "Expected an error looking for elements with no results."
   rescue RuntimeError => e
-    puts "Caught expected error: #{e.message}"
+    log "Caught expected error: #{e.message}"
   end
   error err unless err.empty?
 end
@@ -116,7 +116,7 @@ Given(/^the user expects an error in a multi_find_all lookup matching all elemen
     )
     err = "Expected an error matching all elements with results."
   rescue RuntimeError => e
-    puts "Caught expected error: #{e.message}"
+    log "Caught expected error: #{e.message}"
   end
   error err unless err.empty?
 end

data/test/features/step_definitions/validation_steps.rb

@@ -234,12 +234,12 @@ end
 Then(/^the firefox browser named "(.*?)" has a profile$/) do |name|
   if scenario.storage.has? name
     b = scenario.storage.get name
-    if b.browser_name == "remote"
+    if b.name == "remote"
       if b.driver.capabilities.firefox_profile.nil?
         raise "Remote Firefox Profile is not set"
       end
     else
-      if !b.optional_data.has_key? "profile" and !b.optional_data.has_key? :profile
+      if !b.options.has_key? "profile" and !b.optional_data.has_key? :profile
         raise "No profile found in the optional data"
       end
     end

data/test/server/start.rb

@@ -12,6 +12,6 @@ thread = Thread.new { server.start }
 
 # If this file was executed manually, let's wait for input
 if __FILE__ == $0
-  puts "Press enter to shut down the server."
+  log "Press enter to shut down the server."
   gets
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapis_lazuli
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Onno Steenbergen
@@ -17,154 +17,154 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.17'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
   name: faraday_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: teelogger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.11'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.20'
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
@@ -174,9 +174,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -184,35 +181,32 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
@@ -220,9 +214,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
@@ -230,9 +221,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
 description: "\n    LapisLazuli provides cucumber helper functions and scaffolding
@@ -248,6 +236,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -263,7 +252,6 @@ files:
 - lib/lapis_lazuli/browser/error.rb
 - lib/lapis_lazuli/browser/find.rb
 - lib/lapis_lazuli/browser/interaction.rb
-- lib/lapis_lazuli/browser/remote.rb
 - lib/lapis_lazuli/browser/screenshots.rb
 - lib/lapis_lazuli/browser/wait.rb
 - lib/lapis_lazuli/cli.rb
@@ -297,7 +285,6 @@ files:
 - lib/lapis_lazuli/storage.rb
 - lib/lapis_lazuli/version.rb
 - lib/lapis_lazuli/versions.rb
-- lib/lapis_lazuli/world/annotate.rb
 - lib/lapis_lazuli/world/api.rb
 - lib/lapis_lazuli/world/browser.rb
 - lib/lapis_lazuli/world/config.rb
@@ -312,7 +299,6 @@ files:
 - test/config/config.yml
 - test/config/cucumber.yml
 - test/config/devices.yml
-- test/features/annotation.feature
 - test/features/bindings.feature
 - test/features/browser.feature
 - test/features/button.feature
@@ -352,7 +338,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -373,7 +359,6 @@ test_files:
 - test/config/config.yml
 - test/config/cucumber.yml
 - test/config/devices.yml
-- test/features/annotation.feature
 - test/features/bindings.feature
 - test/features/browser.feature
 - test/features/button.feature