mini_autobot 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a14588e16f8b9c434b101780dd8fb1fa71817cb9
-  data.tar.gz: 2e2afd19b5fec98af6004574ab86381fee2e0187
+  metadata.gz: e3d3f8c199d91925344353710e03c578672d7b81
+  data.tar.gz: a382bb4d189785fdd3bc0246fea2f9932bcb4c31
 SHA512:
-  metadata.gz: 0feb69768feedbaf3854a029cdda38087a804b2ddb0f8ef916165df120c5586c29be90db121ff7778dddc9a2091793673cde195985dff87f551be79f5938e373
-  data.tar.gz: 5979f5305990382caa7e682c8d23513d9e0f09b82b7e4cb21cbc59f15c97f91d3e0bb729c354f7b65f45afd34b978b7314cf0532b9f72a0be82eecef246c1afe
+  metadata.gz: 1ff48851c618fc2ded94312117c6f158ffc3ab3b2c579d24f53a9ea5a678c15abccbd1b6c32cb541b10a227c8208e5f968444a69b72fdf955730add380cd99ca
+  data.tar.gz: 290267038060aa30ce6da5d93ac7558b4b76fabc6b2fa1b8e72373cfcf371491ee5ccf514048e99da4a498ecb3b99805f7278ca3f100fd263967536a41152f96

data/lib/mini_autobot.rb

@@ -11,7 +11,7 @@ require 'erb'
 require 'faker'
 require 'selenium/webdriver'
 require 'rest-client'
-
+require 'json'
 require 'cgi'
 require 'pathname'
 

data/lib/mini_autobot/parallel.rb

@@ -122,19 +122,8 @@ module MiniAutobot
     # call saucelabs REST API to get last #{limit} jobs' statuses
     # possible job status: complete, error, in progress
     def saucelabs_last_n_statuses(limit)
-      connector = MiniAutobot.settings.connector # eg. saucelabs:phu:win7_ie11
-      overrides = connector.to_s.split(/:/)
-      file_name = overrides.shift
-      path = MiniAutobot.root.join('config/mini_autobot', 'connectors')
-      filepath  = path.join("#{file_name}.yml")
-      raise ArgumentError, "Cannot load profile #{file_name.inspect} because #{filepath.inspect} does not exist" unless filepath.exist?
-      cfg = YAML.load(File.read(filepath))
-      cfg = Connector.resolve(cfg, overrides)
-      cfg.freeze
-      username = cfg["hub"]["user"]
-      access_key = cfg["hub"]["pass"]
-
-      require 'json'
+      username = MiniAutobot.settings.sauce_username
+      access_key = MiniAutobot.settings.sauce_access_key
 
       # call api to get most recent #{limit} jobs' ids
       http_auth = "https://#{username}:#{access_key}@saucelabs.com/rest/v1/#{username}/jobs?limit=#{limit}"

data/lib/mini_autobot/settings.rb

@@ -33,6 +33,19 @@ module MiniAutobot
       hsh.fetch(:env, :rent_qa).to_s
     end
 
+    def sauce_session_http_auth(driver)
+      session_id = driver.session_id
+      "https://#{sauce_username}:#{sauce_access_key}@saucelabs.com/rest/v1/#{sauce_username}/jobs/#{session_id}"
+    end
+
+    def sauce_username
+      sauce_user["user"]
+    end
+
+    def sauce_access_key
+      sauce_user["pass"]
+    end
+
     def io
       hsh[:io]
     end
@@ -83,6 +96,19 @@ module MiniAutobot
     private
     attr_reader :hsh
 
+    def sauce_user
+      overrides = connector.split(/:/)
+      file_name = overrides.shift
+      path = MiniAutobot.root.join('config/mini_autobot', 'connectors')
+      filepath  = path.join("#{file_name}.yml")
+      raise ArgumentError, "Cannot load profile #{file_name.inspect} because #{filepath.inspect} does not exist" unless filepath.exist?
+
+      cfg = YAML.load(File.read(filepath))
+      cfg = Connector.resolve(cfg, overrides)
+      cfg.freeze
+      cfg["hub"]
+    end
+
   end
 
 end

data/lib/mini_autobot/utils/page_object_helper.rb

@@ -1,4 +1,3 @@
-
 module MiniAutobot
   module Utils
 
@@ -32,6 +31,13 @@ module MiniAutobot
         @driver = override_driver if !override_driver.nil?
         instance = klass.new(@driver)
 
+        # Set SauceLabs session(job) name to test's name if running on Saucelabs
+        begin
+          update_sauce_session_name if connector_is_saucelabs? && !@driver.nil?
+        rescue
+          self.logger.debug "Failed setting saucelabs session name for #{name()}"
+        end
+
         # Before visiting the page, do any pre-processing necessary, if any,
         # but only visit the page if the pre-processing succeeds
         if block_given?
@@ -63,10 +69,9 @@ module MiniAutobot
           take_screenshot
         end
         begin
-          update_sauce_session if connector_is_saucelabs? && !@driver.nil?
-          self.logger.debug "Finished setting saucelabs session name for #{name()}"
+          update_sauce_session_status if connector_is_saucelabs? && !@driver.nil? && !skipped?
         rescue
-          self.logger.debug "Failed setting saucelabs session name for #{name()}"
+          self.logger.debug "Failed setting saucelabs session status for #{name()}"
         end
 
         MiniAutobot::Connector.finalize!
@@ -124,27 +129,16 @@ module MiniAutobot
       end
 
       # Update SauceLabs session(job) name
-      # Update session(job) status if test is not skipped
-      def update_sauce_session
-        connector = MiniAutobot.settings.connector # eg. saucelabs:phu:win7_ie11
-        overrides = connector.to_s.split(/:/)
-        new_tags = overrides[2]+"_by_"+overrides[1]
-        file_name = overrides.shift
-        path = MiniAutobot.root.join('config/mini_autobot', 'connectors')
-        filepath  = path.join("#{file_name}.yml")
-        raise ArgumentError, "Cannot load profile #{file_name.inspect} because #{filepath.inspect} does not exist" unless filepath.exist?
-
-        cfg = YAML.load(File.read(filepath))
-        cfg = Connector.resolve(cfg, overrides)
-        cfg.freeze
-        username = cfg["hub"]["user"]
-        access_key = cfg["hub"]["pass"]
+      def update_sauce_session_name
+        http_auth = MiniAutobot.settings.sauce_session_http_auth(@driver)
+        body = { "name" => name() }
+        RestClient.put(http_auth, body.to_json, {:content_type => "application/json"})
+      end
 
-        require 'json'
-        session_id = @driver.session_id
-        http_auth = "https://#{username}:#{access_key}@saucelabs.com/rest/v1/#{username}/jobs/#{session_id}"
-        body = { "name" => name(), "tags" => [new_tags] }
-        body["passed"] = passed? unless skipped?
+      # Update session(job) status if test is not skipped
+      def update_sauce_session_status
+        http_auth = MiniAutobot.settings.sauce_session_http_auth(@driver)
+        body = { "passed" => passed? }
         RestClient.put(http_auth, body.to_json, {:content_type => "application/json"})
       end
 

data/lib/mini_autobot/version.rb

@@ -1,3 +1,3 @@
 module MiniAutobot
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/mini_autobot.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.description   = %q{Wrapper of minitest and selenium-webdriver that supports multiple webapps
                           and multiple OS/browser ui automation testing, ready to be integrated in
                           development pipeline with jenkins and saucelabs.}
-  s.homepage      = "https://github.com/rentpath/autobots"
+  s.homepage      = "https://github.com/rentpath/mini_autobot"
   s.license       = "MIT"
 
   s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_autobot
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ripta Pasay
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -229,7 +229,7 @@ files:
 - lib/tapout/custom_reporters/fancy_tap_reporter.rb
 - lib/yard/tagged_test_case_handler.rb
 - mini_autobot.gemspec
-homepage: https://github.com/rentpath/autobots
+homepage: https://github.com/rentpath/mini_autobot
 licenses:
 - MIT
 metadata: {}