selwet 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36cab4eaa1bb6cadd243cbed72cd8f24085f48ae
-  data.tar.gz: 7533d95c91fad7bc6a1d1a9165ca5a54e24e887d
+  metadata.gz: 3de1654c6b1591759f40cb79d967cf19b716818c
+  data.tar.gz: be45611e7b10d40e2278efb1e56e94e2e235789f
 SHA512:
-  metadata.gz: 371974fc8d1f0ee692edf3bc8349d3e3d35dec7c7f1f8540e4789a8f0169642cd562737382a1bd17e09c96bdfc916989709e0dd30e00225848e1925163ece9e3
-  data.tar.gz: 3fe32defa379b41c1e5546a213f413e52005f367bfd015e30d5c817d8e973ff801455c63028b9b3a3619d91718ae75cddcd5bbc33c2a64a6bf2de49f2e78690b
+  metadata.gz: 26329edbd23d986c460c9375f16b8c2fa00b0a773399a720aa0b6384e433f7f1383ed85f23ed64a563616f10eafec36fe31d46a15568866928180e637a4dee42
+  data.tar.gz: 7892b699ee0af75c09d79773a76f5b1f2ac1d2f00f340936146798bb371e905a8e4fc6f9d3ff5d4e58ab7f3d91a00e10c9eace405bb957e0c8e12fdc6333052b

data/lib/selwet.rb

@@ -50,6 +50,15 @@ module SelWeT
     class ElementIsMissingError < Error
     end
 
+    class ConnectionRefusedError < Error
+    end
+
+    class PageLoadError < Error
+    end
+
+    class ElementIsNotDisplayedError < Error
+    end
+
     class << self
 #Кликает на кнопку 'Cancel' в окне алерта.
 #@example
@@ -153,22 +162,35 @@ module SelWeT
 #         ...
 #@see alert_ok
 #@see alert_cancel
-      def click selector, desc = nil
+ 
+
+def click selector, desc = nil
         raise(ArgumentValueError, "Invalid value \"#{selector}\" of argument 'selector'") unless selector.class == String
         raise(ArgumentValueError, "Invalid value \"#{desc}\" of  argument 'desc'") unless [String, NilClass].include?(desc.class)
-        if check_element(selector) 
-          element = @@driver.find_element(:css => selector)
-          raise "Element \"#{selector}\" is not displayed!" unless element.displayed?
-          wait = Selenium::WebDriver::Wait.new
-          element.click
-          if (@@browser == :chrome)
-                sleep 1
-          end
-          wait.until { @@driver.execute_script("return window.onunload = function(){return window.onload}; ") }
-        else
-          raise(ElementIsMissingError, desc ? "Element #{desc} is missing" :"Element #{selector} is missing")
-        end
+        i = 0
+            if (check_element(selector))
+                begin    
+                    element = @@driver.find_element(:css => selector)
+                    raise(ElementIsNotDisplayedError, "Element \"#{selector}\" is not displayed") unless displayed?(selector)
+                    element.click
+                    if (@@browser == :chrome)
+                        sleep 1
+                    end
+                    wait = Selenium::WebDriver::Wait.new
+                    wait.until { @@driver.execute_script("return window.onunload = function(){return window.onload}; ") }
+                rescue ElementIsNotDisplayedError
+                    i = i + 1
+                    if i <= 2 
+                        sleep @@timewait
+                        retry
+                    else
+                        raise(ElementIsNotDisplayedError, "Element \"#{selector}\" is not displayed") unless displayed?(selector)
+                end
+            end
+         end
       end
+
+
 #Закрыть окно с номером num. Окна нумируются в порядке их открытия. Нумирация начинается с 0. Если необходимо закрыть текущее окно, то перед закрытием необходимо переключиться на другое окно. После закрытия окна происходить их переупорядочивание. Так, например, если было закрыто первое окно (num = 0), то второе окно станет первым (было num = 1, стало num = 0) и т.д.
 #@param num [Fixnum] номер окна
 #@example
@@ -230,18 +252,30 @@ module SelWeT
       def fill_in selector, value
         raise(ArgumentValueError, "Invalid value \"#{selector}\" of argument 'selector'") unless selector.class == String
         raise(ArgumentValueError, "Invalid value \"#{value}\" of argument 'value'") unless value.class == String
+        i = 0
         if check_element(selector)
-          element = @@driver.find_element(:css => selector)
-          raise "Element \"#{selector}\" not displayed!" unless element.displayed?
-          begin
-            @@driver.action.move_to(element).perform
-            element.clear
-          rescue
+            begin
+                element = @@driver.find_element(:css => selector)
+                raise(ElementIsNotDisplayedError, "Element \"#{selector}\" is not displayed") unless displayed?(selector)
+                begin
+                    @@driver.action.move_to(element).perform
+                    element.clear
+                rescue
             #skip this
-          end
-          element.send_keys(value)
+                end
+                element.send_keys(value)
+            rescue ElementIsNotDisplayedError
+                i = i + 1
+                if i <= 2
+                    sleep @@timewait
+                    retry
+                else
+                    raise(ElementIsNotDisplayedError, "Element \"#{selector}\" is not displayed") unless displayed?(selector)
+                end
+            end
+        
         else
-          raise(ElementIsMissingError, "Element #{selector} is missing")
+            raise(ElementIsMissingError, "Element #{selector} is missing")
         end      
       end
 #Навести курсор на элемент.
@@ -348,17 +382,26 @@ module SelWeT
 #         end
 #         ...
 #@see refresh
-      
       def go_to url
         raise(ArgumentValueError, "Invalid value of argument 'selector'") unless url.class == String
         wait = Selenium::WebDriver::Wait.new
-        @@driver.navigate.to url
-        if (@@browser == :chrome)
+        i = 0
+        begin            
+            @@driver.navigate.to url
+            if (@@browser == :chrome)
                 sleep 1
+            end
+            wait.until { @@driver.execute_script("return window.onload = function(){}; ") }
+            i = i + 1 
+        rescue Exception => e 
+            if i <= 2 
+                @@driver.navigate.refresh
+                retry
+            else 
+                raise(PageLoadError, "Page #{url} didn't load within PageLoadTimeOut time")
+            end
         end
-        wait.until { @@driver.execute_script("return window.onload = function(){}; ") }
-      end
-
+    end
 #Проверяет, открыто ли окно с номером num.
 #@param num [Fixnum] номер окна
 #@return [FalseClass/TrueClass]
@@ -502,25 +545,35 @@ module SelWeT
 #Запускает браузер перед выполнением тестов.
 #Выполняется автоматически непосредственно перед запуском тестов.
       def startup
-        @@driver = nil
-        url = nil
-        unless @@server_url
-          puts 'URL not specified! Local browser will be used.'
-        else
-          url = @@server_url
-        end
-        if @@browser.nil?
-          raise ArgumentError.new('Browser not specified!')
-        end
-        if url
-          if @@browser == :phantomjs
-            @@driver = Selenium::WebDriver.for(:remote, :url => url)
-          else
-            @@driver = Selenium::WebDriver.for(:remote, :desired_capabilities => @@browser, :url => url)
-          end
-        else
-          @@driver = Selenium::WebDriver.for @@browser
+        begin
+            @@driver = nil
+            url = nil
+            unless @@server_url
+                puts 'URL not specified! Local browser will be used.'
+            else
+                url = @@server_url
+            end
+            if @@browser.nil?
+                raise ArgumentError.new('Browser not specified!')
+            end
+            if url
+                if @@browser == :phantomjs
+                    @@driver = Selenium::WebDriver.for(:remote, :url => url)
+                else
+                    @@driver = Selenium::WebDriver.for(:remote, :desired_capabilities => @@browser, :url => url)
+                end
+            else
+                @@driver = Selenium::WebDriver.for @@browser
+            end
+
+            if (@@driver == nil)
+                raise("Can't create driver for #{@@browser.to_s}")
+            end
+
+        rescue Errno::ECONNREFUSED
+            raise(ConnectionRefusedError, "Connection refused on #{@@server_url}\n\n") 
         end
+
         @@driver.manage.timeouts.implicit_wait = @@timewait
         @@driver.manage.timeouts.script_timeout = @@timewait
         @@driver.manage.timeouts.page_load = @@pageload_timewait

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selwet
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Motin Artem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Selenium Web Test