rwebspec 4.1.7 → 4.2.0

data/CHANGELOG

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+4.1.8
+[Fixes] assert
+
+4.1.7
+[Fixes] Default to browser on Mac
+
 4.1.6
 [Enhancement] Remove warning message MAX_MESSAGE_LENGTH redefined
 [Fixes] loading framework not aware of watir-webdriver

data/Rakefile

@@ -78,7 +78,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "4.1.7"
+  s.version = "4.2.0"
   s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax with Watir or Selenium"
 
@@ -97,11 +97,11 @@ spec = Gem::Specification.new do |s|
   s.files = s.files + Dir.glob( "test/**/*" )
   s.files = s.files + Dir.glob( "sample/**/*")
   s.files = s.files + Dir.glob( "docs/**/*" )
-  s.add_dependency(%q<rspec>, [">= 2.10"])
-  s.add_dependency(%q<rspec-core>, ["= 2.10.1"])
-  s.add_dependency(%q<rspec-mocks>, ["= 2.10.1"])
-  s.add_dependency(%q<rspec-expectations>, ["= 2.10.0"])
-  s.add_dependency("commonwatir", ">= 3.0")
+  s.add_dependency(%q<rspec>, ["~> 2.13"])
+  s.add_dependency(%q<rspec-core>, ["~> 2.13.0"])
+  s.add_dependency(%q<rspec-mocks>, ["~> 2.13.0"])
+  s.add_dependency(%q<rspec-expectations>, ["~> 2.13"])
+  s.add_dependency("commonwatir", ">= 4.0.0")
   unless RUBY_PLATFORM =~ /mingw/
     s.add_dependency("selenium-webdriver")
   end

data/lib/extensions/rspec_extensions.rb

@@ -12,15 +12,14 @@ module RSpec
   module Core
     class ExampleGroup
 
-      define_example_method :scenario
-      define_example_method :story
-      define_example_method :test_case
-      define_example_method :use_case
-      define_example_method :test
-
       class << self
         alias_method :specification, :describe
         alias_method :test_suite, :describe
+                
+        alias_method :story, :it
+        alias_method :test_case, :it
+        alias_method :scenario, :it
+        
       end
 
     end

data/lib/rwebspec-common/assert.rb

@@ -443,8 +443,17 @@ module RWebSpec
 
     def assert_text_in_element(element_id, text)
       elem = element_by_id(element_id)
-      assert_not_nil(elem.innerText, "element #{element_id} has no text")
-      perform_assertion { assert(elem.innerText.include?(text), "the text #{text} not found in element #{element_id}") }
+      if RWebSpec.framework == "Watir"							
+        assert_not_nil(elem.innerText, "element #{element_id} has no text")
+        perform_assertion { assert(elem.innerText.include?(text), "the text #{text} not found in element #{element_id}") }
+      else
+        perform_assertion { 
+          # this works in text field
+          assert(element_value(elem).include?(text), "the text #{text} not found in element #{element_id}")
+          # TODO
+        }
+      end
+    
     end
 
     # Use 

data/lib/rwebspec-watir/web_browser.rb

@@ -481,13 +481,8 @@ module RWebSpec
     end
 
     def element_value(elementId)
-      if is_firefox? then
-        elem = element_by_id(elementId)
-        elem ? elem.invoke('innerText') : nil
-      else
-        elem = element_by_id(elementId)
-        elem ? elem.invoke('innerText') : nil
-      end
+      elem = element_by_id(elementId)
+      elem ? elem.invoke('innerText') : nil
     end
 
     def element_source(elementId)

data/lib/rwebspec-webdriver/driver.rb

@@ -30,7 +30,7 @@ module RWebSpec
       # New Options:
       #    :browser => :ie | :firefox | :chrome
       def open_browser(options = {})
-        puts "[DEBUG] [SeleniumDriver] Callling open_browser #{options.inspect}"
+        # puts "[DEBUG] [SeleniumDriver] Callling open_browser #{options.inspect}"
 
         begin
           support_unicode

data/lib/rwebspec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rwebspec
 version: !ruby/object:Gem::Version
-  version: 4.1.7
+  version: 4.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,72 +9,72 @@ authors:
 autorequire: rwebspec
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 2.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 2.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: commonwatir
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement