selenium-dsl 0.1.0 → 0.1.1

data/lib/selenium_dsl/commands.rb

@@ -16,19 +16,61 @@ class SeleniumDsl
     end
 
     def find_element(typ,el)
-      wait = Selenium::WebDriver::Wait.new(:timeout => 10) 
-      wait.until { @nodes = @nodes.find_element(typ, el) }
+      wait = Selenium::WebDriver::Wait.new(:timeout => 5) 
+      wait.until do
+        try=5
+        begin
+          # sleep 1
+          nodes = @nodes.find_element(typ, el) 
+        rescue Exception => e
+          if e.class == Selenium::WebDriver::Error::NoSuchWindowError ||
+             e.class == Selenium::WebDriver::Error::NoSuchElementError
+            if e.class == Selenium::WebDriver::Error::NoSuchWindowError
+              puts "switch window from #{@driver.window_handle} to #{@driver.window_handles[0]}"  if !opt_v
+              @driver.switch_to.window @driver.window_handles[0]
+              # binding.pry 
+            end
+            try-= 1
+            try>0 ? retry : raise(e.class,e.to_s)
+          else
+            failed
+          end
+        end
+        @nodes = nodes if nodes
+        nodes
+      end
       print '.'.green if !opt_v
-    rescue Exception => e
-      failed
+    # rescue Exception => e
+    #   failed
     end
 
     def find_elements(typ,el,idx)
-      wait = Selenium::WebDriver::Wait.new(:timeout => 10) 
-      wait.until { @nodes = @nodes.find_elements(typ, el)[idx-1] }
+      wait = Selenium::WebDriver::Wait.new(:timeout => 5) 
+      wait.until do
+        try=5
+        begin
+          # sleep 1
+          nodes = @nodes.find_elements(typ, el)[idx-1]
+        rescue Exception => e
+          if e.class == Selenium::WebDriver::Error::NoSuchWindowError ||
+             e.class == Selenium::WebDriver::Error::NoSuchElementError
+            if e.class == Selenium::WebDriver::Error::NoSuchWindowError
+              puts "switch window from #{@driver.window_handle} to #{@driver.window_handles[0]}"  if !opt_v
+              @driver.switch_to.window @driver.window_handles[0]
+              # binding.pry 
+            end
+            try-= 1
+            try>0 ? retry : raise(e.class,e.to_s)
+          else
+            failed
+          end
+        end
+        @nodes = nodes if nodes
+        nodes
+      end
       print '.'.green if !opt_v
-    rescue Exception => e
-      failed
+    # rescue Exception => e
+    #   failed
     end
 
     def parse_cmd(line)
@@ -103,7 +145,7 @@ class SeleniumDsl
           if (parse_cmd(line[0]) && eval("\"#{@return}\" #{splt} /#{line[1]}/"))
             print '.'.green if !opt_v
           else
-            print 'F'.red if !opt_v
+            failed #print 'F'.red if !opt_v
           end
         end
       end
@@ -119,8 +161,8 @@ class SeleniumDsl
     protected
 
     def assert(prm)
-      if prm[0,2]=='->'
-        if @return =~ /#{prm[2,99]}/
+      if prm[0,2]=='=~'
+        if @return =~ /#{prm[2,99].strip}/
           print '.'.green if !opt_v
         else
           failed

data/lib/selenium_dsl/engines.rb

@@ -28,7 +28,9 @@ class SeleniumDsl
     end
 
     def _firefox(prm)
-      @driver = Selenium::WebDriver.for :firefox 
+      profile = Selenium::WebDriver::Firefox::Profile.new
+      profile['browser.cache.disk.enable'] = false
+      @driver = Selenium::WebDriver.for :firefox, :profile => profile 
     end
 
     def _phantomjs(prm)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver