gridium 1.1.36 → 1.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc394adb83e2168340ced467ae4f27984776bc91
-  data.tar.gz: 131259a3fb64cbec4df0c59443199f27d15f7aad
+  metadata.gz: 2dac960c5339e0c6c9e85e83e4902997b21449c5
+  data.tar.gz: d520a854a5490a74a1de76f0ff2f906507c36699
 SHA512:
-  metadata.gz: d4bce2e0436804761bc3e6339da75fd0ea37177c4996ffe065cae100b1210d8ac2bed1eb3501256d4768e71bcb72c5e9927e29e258cffc1590f977d35847b572
-  data.tar.gz: 4dfc11fade041d3309a9ef17c846a380e54fd61b6b8537a775c9c63bf27835576917e44396b44a89497a82e93c91e2f3a3f9198251087e439dcfeda524749824
+  metadata.gz: 137f4306f2c7cfe16ffd5616567060d6819f4a3cb660afada004bcfc78d32d00ece4fdfe14d8ecb042adb67a1f8771237a5b456e59b2b32b0ca6adc8009f7247
+  data.tar.gz: b8d7276446e1d80b7bf92994a380a0ffc50936598e13fae18ab069c937755f8a527bebbd2615bc6fb13b505ac30c457fbd74f514a3e3678108f84021aa7b5e94

data/lib/driver.rb

@@ -206,7 +206,7 @@ class Driver
   def self.verify_url(given_url)
     Log.debug('[Gridium::Driver] Verifying URL...')
     current_url = self.current_url.to_s
-    current_domain = self.current_domain.to_s
+
     if current_url.include?(given_url)
       Log.debug("[Gridium::Driver] Confirmed. (#{current_url}) includes (#{given_url}).")
       $verification_passes += 1
@@ -248,23 +248,30 @@ class Driver
     driver.execute_script "return #{script}"
   end
 
+  #
+  # Saves the screenshot of browser to local disk. Uploads if S3, if configured
+  # @return [String] screenshot_path - Local path, or S3 url
+  #
   def self.save_screenshot(type = 'saved')
     Log.debug ("[Gridium::Driver] Capturing screenshot of browser...")
     timestamp = Time.now.strftime("%Y_%m_%d__%H_%M_%S")
-    screenshot_path = File.join($current_run_dir, "screenshot__#{timestamp}__#{type}.png")
-    driver.save_screenshot(screenshot_path)
-    _save_to_s3_if_configured(screenshot_path)
-    SpecData.screenshots_captured.push("screenshot__#{timestamp}__#{type}.png")   # used by custom_formatter.rb for embedding in report
-    screenshot_path
-  end
+    filename = "screenshot__#{timestamp}__#{type}.png"
+    screenshot_path = local_path = File.join($current_run_dir, filename)
 
-  def self._save_to_s3_if_configured(screenshot_path)
+    # Save screenshot locally
+    driver.save_screenshot(local_path)
+    Log.info("[Gridium::Driver] screenshot saved to #{local_path}")
+
+    # Push the screenshot up to S3?
     if Gridium.config.screenshots_to_s3
-      url = @s3.save_file(screenshot_path)
-      Log.info("[Gridium::Driver] #{screenshot_path} saved to #{url}")
+      screenshot_path = @s3.save_file(local_path)
+      Log.info("[Gridium::Driver] #{filename} uploaded to S3 at '#{screenshot_path}'")
     end
-  end
 
+    SpecData.screenshots_captured.push filename   # used by custom_formatter.rb for embedding in report
+
+    screenshot_path
+  end
 
   def self.list_open_windows
     handles = driver.window_handles

data/lib/testrail.rb

@@ -59,20 +59,28 @@ module Gridium
         if rspec_test.nil? then
           Log.error("[GRIDIUM::TestRail] No test added to results. Turn of Gridium.config.testrail\n")
         end
+
         if rspec_test.exception
           status = CONFIG[:fail]
           message = rspec_test.exception.message
+          screenshot_url = rspec_test.metadata[:screenshot_url]
+          if screenshot_url
+            message << "- Screenshot: #{screenshot_url}"
+          end
         else
           status = CONFIG[:pass]
           message = 'Test Passed.'
         end
+
         test_info = {:case_id => rspec_test.metadata[:testrail_id], :status_id => status, :comment => message}
+
         @tc_results.push(test_info)
         @tc_ids.push(test_info[:case_id])
         added = true
-       end
-       return added
-     end
+      end
+
+      return added
+    end
 
     # Updates the existing test run with test cases and results.  Adds error text for missing test cases if needed. Closes the run as long as it exists.
     #
@@ -151,5 +159,4 @@ module Gridium
       result
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gridium
 version: !ruby/object:Gem::Version
-  version: 1.1.36
+  version: 1.1.37
 platform: ruby
 authors:
 - Seth Urban
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler