saucer 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55a94b5cde4a3bf98c9a3e8975f623f42b72d01c
-  data.tar.gz: 3b792a0629f64db6eb9af000d830e3edb7d01143
+  metadata.gz: 4a2c37e1cabccacc4e978ccea9531be62b2397bf
+  data.tar.gz: 42780591f1c4b0a3a7f6f1972ff6e1f45417db14
 SHA512:
-  metadata.gz: 7ce5b1cfefb461d8e2d6202ab06b86bf29795d642a077c221eefb5e079a3deb61aafcc060f6ad9852155133da58881a37426cf5a0524ebfd0401fd2325b35bf6
-  data.tar.gz: 71830226607e765638ecfe360f0a902b59b528bb888a229c62c211eaf723513a1bfd15543d1954d3f5a03fb97c4a41ca7ced3ac07b036a0d032e486428405e4b
+  metadata.gz: bd6dcb38eeb62ec7a203fc3e4725f8fd7e2f8d322637151df0b326fb9510444acf7edd9ad826da6a8f745336326a2294d11b5814a56426b9857d07f31f5c8c6c
+  data.tar.gz: 743b759e3447cba6f4e3b81a8a34f797abd08f527ba79f2f4b954af21508842454577b951815e5eb339ff7ffdf883e5b6d198459d518a9cce7281aebafd68f71

data/README.md

@@ -2,6 +2,9 @@
 
 Convenience methods for running your Ruby tests on Sauce Labs
 
+## Disclaimer
+*This code is provided on an "AS-IS” basis without warranty of any kind, either express or implied, including without limitation any implied warranties of condition, uninterrupted use, merchantability, fitness for a particular purpose, or non-infringement. Your tests and testing environments may require you to modify this framework. Issues regarding this framework should be submitted through GitHub. For questions regarding Sauce Labs integration, please see the Sauce Labs documentation at https://wiki.saucelabs.com/. This framework is not maintained by Sauce Labs Support.*
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/saucer/annotations.rb

@@ -1,30 +1,30 @@
 module Saucer
   module Annotations
 
-    def comment(comment)
+    def comment=(comment)
       driver.execute_script("sauce:context=#{comment}")
     end
 
-    def job_result(result)
+    def job_result=(result)
       raise ArgumentError, "invalid value for result" unless ['passed', 'failed', true, false].include?(result)
       driver.execute_script("sauce:job-result=#{result}")
     end
 
-    def job_name(name)
+    def job_name=(name)
       driver.execute_script("sauce:job-name=#{name}")
     end
 
-    def job_tags(tags)
+    def job_tags=(tags)
       tags = tags.join(',') if tags.is_a?(Array)
       driver.execute_script("sauce:job-tags=#{tags}")
     end
 
-    def job_info(info)
+    def job_info=(info)
       raise ArgumentError, "job info must be JSON" unless info.is_a? JSON
       driver.execute_script("sauce:job-info=#{info}")
     end
 
-    def build_name(name)
+    def build_name=(name)
       driver.execute_script("sauce:job-build=#{name}")
     end
 

data/lib/saucer/config/sauce.rb

@@ -10,17 +10,24 @@ module Saucer
         @@scenario
       end
 
-      DATA_PARAMS = %i(name build language host_os version ci ip gems framework page_object harness).freeze
+      DATA_PARAMS = %i(name build language host_os version ci ip gems framework page_object harness selenium).freeze
 
       FRAMEWORKS = %w(capybara watir).freeze
       PAGE_OBJECTS = %w(site_prism page-object watirsome watir_drops).freeze
 
       def initialize(opt = {})
+        opt[:browser_name] ||= ENV['BROWSER']
+        opt[:platform] ||= ENV['PLATFORM']
+        opt[:version] ||= ENV['VERSION']
+
         @gems = {}
-        Bundler.definition.dependencies.map(&:name).each do |gem_name|
+        Bundler.definition.specs.map(&:name).each do |gem_name|
+          next if Bundler.environment.specs.to_hash[gem_name].empty?
           @gems[gem_name] = Bundler.environment.specs.to_hash[gem_name].first.version.version
         end
 
+        @selenium = @gems['selenium-webdriver']
+
         frameworks = @gems.select { |gem| FRAMEWORKS.include? gem }
         @framework = frameworks.first if frameworks.size == 1
 
@@ -28,7 +35,7 @@ module Saucer
         @page_object = page_objects.first if page_objects.size == 1
 
         @name = opt[:name] if opt.key? :name
-        @build = opt[:build] if opt.key? :build
+        @build = opt[:build] || ['BUILD_TAG'] || "Build - #{Time.now.to_i}"
 
         if RSpec.respond_to?(:current_example) && !RSpec.current_example.nil?
           @name ||= RSpec.current_example.full_description

data/lib/saucer/config/selenium.rb

@@ -2,6 +2,8 @@ module Saucer
   module Config
     class Selenium < Common
 
+      attr_reader :sauce
+
       CONFIG_PARAMS = %i(browser_name version platform selenium_version
                     chromedriver_version iedriver_version).freeze
 
@@ -14,20 +16,14 @@ module Saucer
         "https://#{@username}:#{@access_key}@ondemand.saucelabs.com:443/wd/hub"
       end
 
-      def opts
-        {url: url, desired_capabilities: capabilities}
-      end
-
       def capabilities
         caps = @config_params.each_with_object({}) do |param, hash|
           hash[param] = @opts[param] if @opts.key?(param)
           hash[param] ||= ENV[param.to_s] if ENV[param.to_s]
         end
-        sauce = Sauce.new.to_hash
-        caps[:name] = sauce.delete(:name)
-        caps[:build] = sauce.delete(:build)
+        @sauce = Sauce.new.to_hash
 
-        caps[:"sauce:data"] = sauce.to_hash
+        caps[:"sauce:data"] = @sauce.to_hash
         browser_name = @opts[:browser_name] || :chrome
         ::Selenium::WebDriver::Remote::Capabilities.send(browser_name, caps)
       end

data/lib/saucer/driver.rb

@@ -5,19 +5,28 @@ module Saucer
 
     attr_reader :driver, :config
 
-    def initialize(config = nil)
-      @config = config || Config::Selenium.new
-      @driver = super Selenium::WebDriver::Remote::Bridge.new(@config.opts)
+    def initialize(opt = {})
+      caps = opt[:desired_capabilities] || {}
+      @config ||= Config::Selenium.new(caps)
+      listener = opt.delete :listener
+      opt[:url] = @config.url
+      opt[:desired_capabilities] = @config.capabilities
+
+      bridge = Selenium::WebDriver::Remote::Bridge.new(opt)
+      bridge = Support::EventFiringBridge.new(bridge, listener) if listener
+
+      @driver = super bridge
+
+      @driver.job_name = @config.sauce[:name]
+      @driver.build_name = @config.sauce[:build]
     end
 
     def sauce
       @api ||= API.new(self, @config)
     end
 
-    def quit(data = nil)
-      if data.is_a?(TrueClass) || data.is_a?(FalseClass)
-        result = data
-      elsif RSpec.current_example
+    def quit
+      if RSpec.current_example
         exception = RSpec.current_example.exception
         result = exception.nil?
       elsif Saucer::Config::Sauce.scenario
@@ -26,11 +35,13 @@ module Saucer
       end
 
       if exception
-        @driver.comment "Error: #{exception.inspect}"
-        @driver.comment "Error Location: #{exception.backtrace.first}"
+        @driver.comment = "Error: #{exception.inspect}"
+        @driver.comment = "Error Location: #{exception.backtrace.first}"
       end
 
-      @driver.job_result(result) unless result.nil?
+      @driver.job_result = result unless result.nil?
+      results = @driver.sauce.job.log_url[/(.*)\/.*$/, 1]
+      Selenium::WebDriver.logger.warn("Sauce Labs results: #{results}")
 
       super(*[])
     end

data/lib/saucer/platform_configuration.rb

@@ -10,7 +10,6 @@ module Saucer
       @browser_version = opt[:browser_version] || opt['short_version']
     end
 
-    # TODO update for defaults
     def to_hash
       Platform.send(@os).send(@browser).send("v#{@browser_version}")
     end

data/lib/saucer/version.rb

@@ -1,3 +1,3 @@
 module Saucer
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/saucer.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'parallel_split_test'
   spec.add_dependency 'require_all'
-  spec.add_dependency 'selenium-webdriver'
+  spec.add_dependency 'selenium-webdriver', "~> 3.0", "< 3.4.1"
   spec.add_dependency 'sauce_whisk'
   spec.add_dependency 'sauce_platforms'
   spec.add_dependency 'json'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saucer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,22 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: sauce_whisk
   requirement: !ruby/object:Gem::Requirement