rwebspec 5.3.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 513ae7f9cc41b82561318ede7fea7d155aae5a28
-  data.tar.gz: 2a9cb1472e93d9606709a65dbc7cc064cf853ac2
+  metadata.gz: 2101fdc5d2386755b2a83bc4af0ca3222e72cadd
+  data.tar.gz: 6058c6433d0801b39b31a0575047ac8c3eccb655
 SHA512:
-  metadata.gz: 2b96d1d849fc81b400a28d6e5abe79f00dcf29cb11b5f623dab6c1fbac6c5843a4820a73a4f360f789c983c1e27f8280260758e5c06775e4f5448dfc3c8ec9c1
-  data.tar.gz: 4cf582825f126a6e92340403c279849e1d6d2176c9cfb8988c4419ffa7f030fb4f45f02d5f070c9473966ff36ca92121db0850f6fcbff32de5fbd6e2a405a1e5
+  metadata.gz: d72abc7d2068ee43f8f9eaad950c661bee1e23da55c76ed65266070b7988694e8cc2e5214923b197640977972e716e06a272ab2df12e6793c6ccbdfef9bfce2d
+  data.tar.gz: a7c10730c9f906674b8cd50bd926db394240b668905bc4e5d98968f967098fcd9f80eb0bce11c22478c851453a7d6487fb290d2dec19b9cd34cca154ca3391fe

data/CHANGELOG

@@ -1,12 +1,26 @@
 CHANGELOG
 =========
 
+6.0
+[Feature] Support RSpec 3
+[Feature] Default to use RSpec 3 recommend expect syntax
+[Feature] Drop MiniTest (and its workaround), use own assert method
+[Deprecated] Drop "test_suite" and "specification", use stand RSpec's describe to group test cases.
+[Deprecated] 
+			alias try_upto  try_for
+			alias try_up_to try_for
+			alias try_until try_for
+[Deprecated] 
+		  try, use try_for
+[Deprecated] 
+      repeated_try, use try_for	
+[Update] ContainsText matcher for RSpec 3
+
 5.3.0
 [New] Lock on RSpec 2.14
 [New] Support ActiveSupport 4
 [New] Part support of RSpec to use :should syntax
 
-
 5.2.1
 [Fixes] add assertions attribute to RWebSpec::AbstractWebPage to support MiniTest 5
         (for non-rwebspec projects, users need to handle themselves)

data/Rakefile

@@ -77,7 +77,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "5.3.0"
+  s.version = "6.0.1"
   s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax with Watir or Selenium WebDriver"
 
@@ -97,19 +97,20 @@ 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.14"])
-  s.add_dependency(%q<rspec-core>, ["~> 2.14"])
-  s.add_dependency(%q<rspec-mocks>, ["~> 2.14"])
-  s.add_dependency(%q<rspec-expectations>, ["~> 2.14"])
-  s.add_dependency("commonwatir", ">= 4.0.0")
-  s.add_dependency("minitest", ">= 4.0")
+
+  s.add_dependency(%q<rspec>, ["~> 3.0"])
+  s.add_dependency(%q<rspec-core>, ["~> 3.0"])
+  s.add_dependency(%q<rspec-mocks>, ["~> 3.0"])
+  s.add_dependency(%q<rspec-expectations>, ["~> 3.0"])
+  s.add_dependency("commonwatir", "~> 4.0.0")
+
   s.add_dependency("activesupport", ">= 3.2.17")
   # s.add_dependency("ci_reporter", "~> 1.9.2")
     
   unless RUBY_PLATFORM =~ /mingw/
-    s.add_dependency("selenium-webdriver", ">= 2.40")
+    s.add_dependency("selenium-webdriver", "~> 2.42")
   else
-    s.add_dependency("watir-classic", ">= 4.0.0")
+    s.add_dependency("watir-classic", "~> 4.0.1")
   end
 end
 

data/lib/extensions/rspec_extensions.rb

@@ -1,4 +1,8 @@
 
+=begin
+
+# Deprecated for RSpec 3
+
 module RSpec
   module Core
  		module DSL
@@ -8,11 +12,14 @@ module RSpec
 	end
 end
 
+=end
+
 module RSpec
   module Core
     class ExampleGroup
 
       class << self
+        # the following might not be used
         alias_method :specification, :describe
         alias_method :test_suite, :describe
                 

data/lib/rwebspec-common/assert.rb

@@ -1,8 +1,22 @@
 
 module RWebSpec
   module Assert
-    include ::MiniTest::Assertions
-
+    
+    # own assert method
+    def assert test, msg = nil
+      msg ||= "Failed assertion, no message given."
+      # comment out self.assertions += 1 to counting assertions
+      unless test then
+        msg = msg.call if Proc === msg
+        raise RWebSpec::Assertion, msg
+      end
+      true
+    end
+    
+    def fail(message)
+      perform_assertion { assert(false, message) }
+    end
+    
     def assert_not(condition, msg = "")
       perform_assertion { assert(!condition, msg) }
     end
@@ -11,11 +25,6 @@ module RWebSpec
       perform_assertion { assert(!actual.nil?, msg) }
     end
 
-    def fail(message)
-      perform_assertion { assert(false, message) }
-    end
-
-    # assertions
     def assert_title_equals(title)
       assert_equals(title, @web_browser.page_title)
     end

data/lib/rwebspec-common/core.rb

@@ -6,6 +6,13 @@
 # useful hekoer methods for testing
 #
 module RWebSpec
+  
+  class Assertion < Exception 
+    def error
+      self
+    end
+  end
+  
   module Core
 
       # open a browser, and set base_url via hash, but does not acually
@@ -122,8 +129,12 @@ module RWebSpec
           yield
           last_error = nil
 					return true 
-        rescue MiniTest::Assertion => e1
+        rescue RWebSpec::Assertion => e1
           last_error = e1
+        rescue ArgumentError => ae
+          last_error = ae
+        rescue RSpec::Expectations::ExpectationNotMetError => ree
+          last_error = ree          
         rescue => e
           last_error = e
         end
@@ -134,18 +145,20 @@ module RWebSpec
       raise "Timeout after #{duration.to_i} seconds."
     end
 
-    alias try_upto  try_for
-    alias try_up_to try_for
-    alias try_until try_for
-
+    # Deprecated
+    # alias try_upto  try_for
+    # alias try_up_to try_for
+    # alias try_until try_for
+=begin
     def try(timeout = $testwise_polling_timeout, polling_interval = $testwise_polling_interval || 1, &block)
       puts "Warning: method 'try' is deprecated (won't support in RWebSpec 3), use try_for instead."
       try_for(timeout, polling_interval) {
         yield
       }
     end
+=end
     
-    
+=begin    
     # Try the operation up to specified times, and sleep given interval (in seconds)
     # Error will be ignored until timeout
     # Example
@@ -171,6 +184,7 @@ module RWebSpec
       end
       yield
     end
+=end
 
     
     ##
@@ -240,6 +254,9 @@ module RWebSpec
     def failsafe(& block)
       begin
         yield
+      rescue RWebSpec::Assertion => e1        
+      rescue ArgumentError => ae
+      rescue RSpec::Expectations::ExpectationNotMetError => ree
       rescue =>e
       end
     end

data/lib/rwebspec-common/matchers/contains_text.rb

@@ -23,10 +23,13 @@ class ContainsText
   end
 
   # error message for should_not
-  def negative_failure_message
+  def failure_message_when_negated
     "expected '#{actual_text}' not to contain '#{@expected}', but it did"
   end
 
+  # RSpec 2 compatibility:
+  alias_method :failure_message_for_should, :failure_message
+  alias_method :failure_message_for_should_not, :failure_message_when_negated
 end
 
 
@@ -35,3 +38,6 @@ def contains_text?(expected)
   ContainsText.new(expected)
 end
 alias contains? contains_text?
+alias contains contains_text?
+alias contain? contains_text?
+alias contain contains_text?

data/lib/rwebspec-common/web_page.rb

@@ -33,10 +33,8 @@ module RWebSpec
     # browser: passed to do assertion within the page
     # page_text: text used to identify the page, title will be the first candidate
     attr_accessor :page_specific_text
-    attr_accessor :assertions  # for MiniTest 5: https://github.com/seattlerb/minitest/issues/286
     
     def initialize(the_browser, page_specific_text = nil)
-      self.assertions = 0    # MiniTest 5
       
       @web_browser = @browser =  @web_tester = the_browser
       @page_specific_text = page_specific_text

data/lib/rwebspec-webdriver/web_browser.rb

@@ -255,6 +255,7 @@ module RWebSpec
 				@browser.find_element(:tag_name, "body").text
       end
 
+=begin
 			# @deprecated
 			def text_with_sanitize				
 				begin
@@ -268,6 +269,7 @@ module RWebSpec
 					return @browser.html
 				end
 			end
+=end
 			
 			# :links => removed
 			# :checkboxes => removed
@@ -718,21 +720,7 @@ module RWebSpec
       # http://wiki.openqa.org/display/WTR/FAQ#FAQ-HowdoIattachtoapopupwindow%3F
       #
       def start_clicker(button, waitTime= 9, user_input=nil)
-        # get a handle if one exists
-        hwnd = @browser.enabled_popup(waitTime)
-        if (hwnd) # yes there is a popup
-          w = WinClicker.new
-          if (user_input)
-            w.setTextValueForFileNameField(hwnd, "#{user_input}")
-          end
-          # I put this in to see the text being input it is not necessary to work
-          sleep 3
-          # "OK" or whatever the name on the button is
-          w.clickWindowsButton_hwnd(hwnd, "#{button}")
-          #
-          # this is just cleanup
-          w = nil
-        end
+        raise "Not support when using Selenium WebDriver, try alternative approach."
       end
 
       # return underlying browser

data/lib/rwebspec.rb

@@ -8,8 +8,12 @@ gem "activesupport" #,  "~> 3.2.17"
 require 'active_support'
 require 'active_support/deprecation'
 
-gem "minitest" #, "~> 4.0" # ver 5 return errors
-require 'minitest/autorun'
+# Using own assert
+# 
+# if user want to use testing library such as MiniTest, add require in your own helper and tests
+#
+# gem "minitest" #, "~> 4.0" # ver 5 return errors
+# require 'minitest/autorun'
 
 # Load active_support, so that we can use 1.days.ago
 begin
@@ -31,7 +35,7 @@ if  ::RSpec::Version::STRING && ::RSpec::Version::STRING =~ /^3/
 end
 
 unless defined? RWEBSPEC_VERSION
-  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "5.3.0"
+  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "6.0.1"
 end
 
 $testwise_polling_interval = 1 # seconds

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rwebspec
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Zhimin Zhan
 autorequire: rwebspec
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,84 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 - !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
@@ -112,16 +98,16 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.40'
+        version: '2.42'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.40'
+        version: '2.42'
 description: Executable functional specification for web applications in RSpec syntax
   with Watir or Selenium WebDriver
 email: zhimin@agileway.com.au