rwebspec 5.0.3 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c51c5e4e8e790cf5836d5b731778df3dc361de7d
-  data.tar.gz: 63e0adb033dd8ac4e58af344759895b5bdb5cfec
+  metadata.gz: 93b6b8fe7fea586a71732d1d5e7f169a2d55d169
+  data.tar.gz: a51ec988649fc537843c19c23a2b219ef8ea9b1f
 SHA512:
-  metadata.gz: 4bc94fa500322f4a8b45f9aaa99a63f7aa2f84c9824196ce0ea423c073fce04339752ddb4e323c96fbdc2a7125c5d308e1c3754175e6d41a5a4d7c4686d574c1
-  data.tar.gz: 917853302ffc7cd70b8bbcec91016ef188be2c5962ff5d1a53cf092da3b4617ce33dc2d1bc2b2d447ba750526b7db780ec0aa64c7605758ae4fcaac483091e9f
+  metadata.gz: 4eddeb039df9ce3309beb7996974f3937de4d0f67d1d11dd06912c0f709ce3f70993f7882b6c960e8f5aaee79380c5be876862a999c944ed4e02c455331a49fd
+  data.tar.gz: 80424f6d8a6e18e2a5a802fdc7484418ac5037b0f7b8e4ba2e9580513ad21a336fed30b972c2bf8de9b58189416062d187fd260c7c6898bf4b2cfe86a0b833e6

data/CHANGELOG

@@ -1,6 +1,14 @@
 CHANGELOG
 =========
 
+5.1
+[Feature] Use minitest 4 for assertion
+[Fixes] Handle assert_text_present in try_for{}
+[Change] Lock activesupport version 3.2.17
+
+5.0.4
+[Enhancement] click_button_with_id, click_link_with_id will focus on the element first (Selenium) to avoid unable to click when the browser window too small.
+
 5.0.2
 [Fixes] inconsistency enter_text_with_id() between Watir and Selenium
 

data/Rakefile

@@ -77,9 +77,9 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "5.0.3"
+  s.version = "5.1.0"
   s.summary = "Web application functional specification in Ruby"
-  s.description = "Executable functional specification for web applications in RSpec syntax with Watir or Selenium"
+  s.description = "Executable functional specification for web applications in RSpec syntax with Watir or Selenium WebDriver"
 
   s.author  = "Zhimin Zhan"
   s.email   = "zhimin@agileway.com.au"
@@ -102,6 +102,8 @@ spec = Gem::Specification.new do |s|
   s.add_dependency(%q<rspec-mocks>, [">= 2.13.0"])
   s.add_dependency(%q<rspec-expectations>, [">= 2.13"])
   s.add_dependency("commonwatir", ">= 4.0.0")
+  s.add_dependency("minitest", "~> 4.0")
+  s.add_dependency("activesupport", "~> 3.2.17")
     
   unless RUBY_PLATFORM =~ /mingw/
     s.add_dependency("selenium-webdriver")

data/lib/rwebspec-common/assert.rb

@@ -1,17 +1,12 @@
-require 'test/unit/assertions'
 
 module RWebSpec
   module Assert
-    include Test::Unit::Assertions
+    include ::MiniTest::Assertions
 
     def assert_not(condition, msg = "")
       perform_assertion { assert(!condition, msg) }
     end
 
-    def assert_nil(actual, msg="")
-      perform_assertion { assert(actual.nil?, msg) }
-    end
-
     def assert_not_nil(actual, msg="")
       perform_assertion { assert(!actual.nil?, msg) }
     end
@@ -509,6 +504,9 @@ module RWebSpec
         # puts "[DEBUG] Assertion error: #{e}"
         take_screenshot if $take_screenshot
         raise e
+      rescue MiniTest::Assertion => e2
+        take_screenshot if $take_screenshot
+        raise e2
       end
     end
 

data/lib/rwebspec-common/core.rb

@@ -122,6 +122,8 @@ module RWebSpec
           yield
           last_error = nil
 					return true 
+        rescue MiniTest::Assertion => e1
+          last_error = e1
         rescue => e
           last_error = e
         end

data/lib/rwebspec-common/web_page.rb

@@ -40,8 +40,9 @@ module RWebSpec
       begin
         snapshot if $TESTWISE_DUMP_PAGE || $TESTWISE_DUMP_PAGE 
         delay = $TESTWISE_PAGE_DELAY || $TESTWISE_PAGE_DELAY
-        sleep(delay)
+        sleep(delay) if delay
       rescue => e
+        puts e.backtrace
       end
       assert_on_page
     end

data/lib/rwebspec-webdriver/web_browser.rb

@@ -458,12 +458,22 @@ module RWebSpec
       def click_link_with_id(link_id, opts = {})
         if opts && opts[:index]
           elements = find_elements(:id, link_id)
+          focus_on_element(elements[opts[:index]-1])
           elements[opts[:index]-1].click
         else
+          focus_on_element(find_element(:id, link_id))
           find_element(:id, link_id).click
         end
       end
 
+      def focus_on_element(elem)
+        begin 
+          elem.send_keys("")          
+        rescue => e
+          # ignore for example, an on hover table might not be ablet to send keys to 
+        end
+      end
+      
       ##
       # click_link_with_text("Login")
       # click_link_with_text("Show", :index => 2)
@@ -487,8 +497,10 @@ module RWebSpec
 					elements = find_elements(:id, id)
 					the_index = opts[:index].to_i() - 1          
           first_match = elements[the_index]
+          focus_on_element(first_match)
           first_match.click
 				else
+				  focus_on_element(find_element(:id, id))
 	        find_element(:id, id).click
         end
 		

data/lib/rwebspec.rb

@@ -4,6 +4,11 @@
 #***********************************************************
 require "rubygems"
 
+gem "activesupport",  "~> 3.2.17"
+gem "minitest", "~> 4.0" # ver 5 return errors
+
+require 'minitest/autorun'
+
 # Load active_support, so that we can use 1.days.ago
 begin
   require 'active_support/basic_object'
@@ -16,7 +21,7 @@ end
 require 'rspec'
 
 unless defined? RWEBSPEC_VERSION
-  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "5.0.2"
+  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "5.1.0"
 end
 
 $testwise_polling_interval = 1 # seconds

metadata

@@ -1,110 +1,138 @@
 --- !ruby/object:Gem::Specification
 name: rwebspec
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.1.0
 platform: ruby
 authors:
 - Zhimin Zhan
 autorequire: rwebspec
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: commonwatir
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.17
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.17
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Executable functional specification for web applications in RSpec syntax
-  with Watir or Selenium
+  with Watir or Selenium WebDriver
 email: zhimin@agileway.com.au
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Rakefile
-- README
 - CHANGELOG
 - MIT-LICENSE
+- README
+- Rakefile
 - lib/extensions/rspec_extensions.rb
 - lib/extensions/watir_extensions.rb
 - lib/extensions/webdriver_extensions.rb
@@ -139,18 +167,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: rwebspec
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Web application functional specification in Ruby