rwebspec 4.3.2 → 4.3.3

data/CHANGELOG

@@ -1,5 +1,11 @@
 CHANGELOG
 =========
+4.3.3
+[Fixes] assert_option_equals for Selenium
+[Fixes] assert_option_present for Selenium
+[Fixes] assert_text_present_in_table for Selenium
+[Enhancement] Add more UI tests and test project can be run in TestWise
+
 4.3.2
 [Fixes] typo on attaching browser for webdriver
 [Update] Change gemspec work with latest RSpec 2.14

data/Rakefile

@@ -78,7 +78,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "4.3.2"
+  s.version = "4.3.3"
   s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax with Watir or Selenium"
 

data/lib/rwebspec-common/assert.rb

@@ -141,22 +141,39 @@ module RWebSpec
     # select
     def assert_option_value_not_present(select_name, option_value)
       @web_browser.select_lists.each { |select|
-        continue unless select.name == select_name
-        select.options.each do |option| # items in the list
-          perform_assertion {  assert(!(option.value == option_value), "unexpected select option: #{option_value} for #{select_name} found") }
+        the_element_name = element_name(select)
+        next unless the_element_name == select_name
+        
+        if RWebSpec.framework =~ /watir/i        
+          select.options.each do |option| # items in the list
+            perform_assertion {  assert(!(option.value == option_value), "unexpected select option: #{option_value} for #{select_name} found") }
+          end
+        else
+          select.find_elements(:tag_name => "option" ).each do |option|
+    	      fail("unexpected option value: #{option_label} found") if option.value == option_value
+    			end          
         end
       }
     end
 
     alias assert_select_value_not_present assert_option_value_not_present
 
+
     def assert_option_not_present(select_name, option_label)
       @web_browser.select_lists.each { |select|
 				the_element_name = element_name(select)
         next unless the_element_name == select_name
-        select.options.each do |option| # items in the list
-          perform_assertion {  assert(!(option.text == option_label), "unexpected select option: #{option_label} for #{select_name} found") }
+        
+        if RWebSpec.framework =~ /watir/i
+          select.options.each do |option| # items in the list
+            perform_assertion {  assert(!(option.text == option_label), "unexpected select option: #{option_label} for #{select_name} found") }
+          end
+        else
+          select.find_elements(:tag_name => "option" ).each do |option|
+    	      fail("unexpected option label: #{option_label} found") if option.text == option_label
+    			end
         end
+        
       }
     end
 
@@ -358,7 +375,13 @@ module RWebSpec
       if RWebSpec.framework == "Watir"			
         perform_assertion {  assert_not(eval("#{tag}(:id, '#{element_id.to_s}').exists?"), "Unexpected element'#{tag}' + with id: '#{element_id}' found")}
       else
-        perform_assertion { assert_not( @web_browser.driver.find_element(:tag_name => tag, :id => element_id))}				
+        perform_assertion { 
+           begin
+             @web_browser.driver.find_element(:tag_name => tag, :id => element_id)
+             fail("the element #{tag}##{element_id} found")
+           rescue =>e  
+           end
+        }	
       end
     end
 
@@ -414,14 +437,16 @@ module RWebSpec
     # Examples
     #  assert_text_present_in_table("t1", ">A<")  # => true
     #  assert_text_present_in_table("t1", ">A<", :just_plain_text => true)  # => false        
-    def assert_text_present_in_table(table_id, text, options = { :just_plain_text => false })
-      perform_assertion { assert(table_source(table_id, options).include?(text), "the text #{text} not found in table #{table_id}") }
+    def assert_text_present_in_table(table_id, text, options = {})
+      options[:just_plain_text] ||= false
+      perform_assertion { assert(the_table_source(table_id, options).include?(text), "the text #{text} not found in table #{table_id}") }
     end
 
     alias assert_text_in_table assert_text_present_in_table
 
-    def assert_text_not_present_in_table(table_id, text, options = { :just_plain_text => false })
-      perform_assertion { assert_not(table_source(table_id, options).include?(text), "the text #{text} not found in table #{table_id}") }
+    def assert_text_not_present_in_table(table_id, text, options = {})
+      options[:just_plain_text] ||= false
+      perform_assertion { assert_not(the_table_source(table_id, options).include?(text), "the text #{text} not found in table #{table_id}") }
     end
 
     alias assert_text_not_in_table assert_text_not_present_in_table
@@ -469,7 +494,7 @@ module RWebSpec
     #    end
 
     private
-    def table_source(table_id, options)
+    def the_table_source(table_id, options)
       elem_table = RWebSpec.framework == "Watir" ? table(:id, table_id.to_s) : @web_browser.driver.find_element(:id => table_id)
       elem_table_text = elem_table.text
       elem_table_html = RWebSpec.framework == "Watir" ?  elem_table.html : elem_table["innerHTML"];

data/lib/rwebspec.rb

@@ -16,7 +16,7 @@ end
 require 'rspec'
 
 unless defined? RWEBSPEC_VERSION
-  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "4.3.2"
+  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "4.3.3"
 end
 
 $testwise_polling_interval = 1 # seconds

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rwebspec
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: rwebspec
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec