gridium 1.0.26 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c1e455704eb16cbaa41dc2b5c57292be5df9366
-  data.tar.gz: 9dd5f0f17283d420d28b33daee281e2bbafe6ae5
+  metadata.gz: 32115dbdf2dd2771f65ef572841160955d84d31a
+  data.tar.gz: eec6da5442e752ce320978eded3d509f5d0d41a5
 SHA512:
-  metadata.gz: ee7d951178c72bfabb80e29a54e3b9d365619554e1c39c36766de08124ed0e51e06f70e58e1a255ad139861e368782fbe8610b55bb7bac3faa33531630a6f63f
-  data.tar.gz: 47b30b89aceca4377ea1d25b80458315aae5c1e349d2380087247c781c330f650c7eefeb49049615b81d9029f73aa77109ce2d2db78fd0e47cb83b8c2f5cb295
+  metadata.gz: 51f8f95300b4910e0a5d2ee2ff288f47bdaa25381c534abaf46e57eadd07b2a062e3b3eb200021611ac53d36450ed42a4a936d9437b957a7c7cf0ec478eaf0e5
+  data.tar.gz: e75adc2c2cb937c1928a0f8b2a4369451b678d4baca7e9011b993ace8f7a79daacd0fb1f4a6b80b5deb383ee4c3642be60596351680e0033f6e2a2c124aa3cbb

data/bin/builder

@@ -7,7 +7,7 @@ main() {
 
   docker exec $(docker-compose ps -q gridium) bash -c "echo -e '---\n:rubygems_api_key: $1' >> ~/.gem/credentials; chmod 0600 ~/.gem/credentials; cat ~/.gem/credentials"
   docker exec $(docker-compose ps -q gridium) bash -c "gem build gridium.gemspec"
-  docker exec $(docker-compose ps -q gridium) bash -c "gem push gridium-1.0.$BUILD_NUMBER.gem"
+  docker exec $(docker-compose ps -q gridium) bash -c "gem push gridium-1.1.$BUILD_NUMBER.gem"
 }
 
 main $1

data/docker-compose.dev.yml

@@ -1,5 +1,11 @@
 version: '2'
 services:
+  hub:
+    ports:
+      - "4444:4444"
+  chrome:
+    ports:
+      - "5900:5900"
   gridium:
     volumes:
       - $GRIDIUMPATH:/gridium

data/docker-compose.yml

@@ -1,13 +1,13 @@
 version: '2'
 services:
   hub:
-    image: sethuster/selenium-hub
+    image: selenium/hub:3.1.0
     ports:
       - "4444"
-  firefox:
-    image: sethuster/node-firefox-debugx
-    ports:
-      - "5900"
+    environment:
+      - GRID_BROWSER_TIMEOUT=30
+  chrome:
+    image: selenium/node-chrome-debug:3.1.0
     depends_on:
       - hub
     environment:
@@ -15,6 +15,8 @@ services:
       - HUB_PORT_4444_TCP_PORT=4444
       - no_proxy=localhost
       - HUB_ENV_no_proxy=localhost
+    ports:
+      - "5900"
   mustadio:
     image: yetanotherlucas/mustadio
     ports:

data/gridium.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock", "~>2.3"
   spec.add_development_dependency "dotenv", "~>2.1"
 
-  spec.add_runtime_dependency "selenium-webdriver", ">= 2.50.0", "< 3"
+  spec.add_runtime_dependency "selenium-webdriver", "3.3.0"
   spec.add_runtime_dependency "oily_png", "~> 1.2"
   spec.add_runtime_dependency 'aws-sdk', '~> 2'
 end

data/lib/driver.rb

@@ -91,7 +91,7 @@ class Driver
         Log.debug("[Gridium::Driver] Page loaded in (#{page_load}) seconds.")
         $verification_passes += 1
       end
-    rescue Selenium::WebDriver::Error::ScriptTimeoutError => e
+    rescue Exception => e
       Log.debug("[Gridium::Driver] #{e.backtrace.inspect}")
       Log.error("[Gridium::Driver] Timed out attempting to load #{path} for #{Gridium.config.page_load_timeout} seconds:\n#{e.message}\n - Also be sure to check the url formatting.  http:// is required for proper test execution (www is optional).")
       raise e

data/lib/element.rb

@@ -127,13 +127,26 @@ class Element
   end
 
   def click
-    Log.debug("Clicking on #{self}")
+    Log.debug("[GRIDIUM::Element] Clicking on #{self}")
+    click_retry = 2
     if element.enabled?
       ElementExtensions.highlight(self) if Gridium.config.highlight_verifications
       $verification_passes += 1
-      element.click
+      begin
+        element.click
+      rescue Exception => e
+        Log.warn("[GRIDIUM::Element] Click Exception retrying...")
+        sleep 0.15
+        click_retry -= 1
+        if click_retry >= 0
+          retry
+        else
+          Log.error("[GRIDIUM::Element] Click Exception #{e}")
+          fail
+        end
+      end
     else
-      Log.error('Cannot click on element.  Element is not present.')
+      Log.error('[GRIDIUM::Element] Cannot click on element.  Element is not present.')
     end
   end
 

data/lib/gridium/version.rb

@@ -1,3 +1,3 @@
 module Gridium
-  VERSION = "1.0.#{ENV['BUILD_NUMBER']}"
+  VERSION = "1.1.#{ENV['BUILD_NUMBER']}"
 end

data/lib/page.rb

@@ -141,7 +141,7 @@ module Gridium
     end
 
     def check(id) #checks a checkbox
-      Driver.driver.find_element(:id, id).click
+      Element.new("Checkbox", :id, id).click
     end
   end
 

data/lib/testrail.rb

@@ -81,17 +81,19 @@ module Gridium
       closed = false
       if Gridium.config.testrail && !@run_info[:error]
         Log.debug("[GRIDIUM::TestRail] Closing test runid: #{@run_info[:id]}\n")
-        r = _send_request('POST', "#{@url}update_run/#{@run_info[:id]}", {:case_ids => @tc_ids})
-        Log.debug("[GRIDIUM::TestRail] UPDATE RUN: #{r}")
-        sleep 0.25
-        r = _send_request('POST', "#{@url}add_results_for_cases/#{@run_info[:id]}", {results: @tc_results})
-        Log.debug("[GRIDIUM::TestRail] ADD RESULTS: #{r}")
-        sleep 0.25
-        Log.debug("#{r.class}")
-        if r.is_a?(Hash)
-          r = _send_request('POST', "#{@url}update_run/#{@run_info[:id]}", {:name => "ER:#{@run_info[:name]}", :description => "#{@run_info[:desc]}\nThe following was returned when adding cases: #{r}"})
-          Log.warn("[GRIDIUM::TestRail] ERROR: #{r}")
+        if @tc_ids.size > 0
+          r = _send_request('POST', "#{@url}update_run/#{@run_info[:id]}", {:case_ids => @tc_ids})
+          Log.debug("[GRIDIUM::TestRail] UPDATE RUN: #{r}")
           sleep 0.25
+          r = _send_request('POST', "#{@url}add_results_for_cases/#{@run_info[:id]}", {results: @tc_results})
+          Log.debug("[GRIDIUM::TestRail] ADD RESULTS: #{r}")
+          sleep 0.25
+          Log.debug("#{r.class}")
+          if r.is_a?(Hash)
+            r = _send_request('POST', "#{@url}update_run/#{@run_info[:id]}", {:name => "ER:#{@run_info[:name]}", :description => "#{@run_info[:desc]}\nThe following was returned when adding cases: #{r}"})
+            Log.warn("[GRIDIUM::TestRail] ERROR: #{r}")
+            sleep 0.25
+          end
         end
         r = _send_request('POST', "#{@url}close_run/#{@run_info[:id]}", nil)
         Log.debug("[GRIDIUM::TestRail] CLOSE RUN: #{r}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gridium
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.1.2
 platform: ruby
 authors:
 - Seth Urban
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,22 +84,16 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.50.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.50.0
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement