watir-rspec 0.0.1 → 0.0.2

data/lib/watir/rspec.rb

@@ -25,134 +25,134 @@ module Watir
   #
   class RSpec
     class << self
-      def bootstrap const
-        const.class_eval do
+        def add_within_and_during_to_matcher const
+          const.class_eval do
 
-          inst_methods = instance_methods.map &:to_sym
+            inst_methods = instance_methods.map &:to_sym
 
-          if !(inst_methods.include?(:__matches?) || inst_methods.include?(:__does_not_match?)) && 
-            (inst_methods.include?(:matches?) || inst_methods.include?(:does_not_match?))
+            if !(inst_methods.include?(:__matches?) || inst_methods.include?(:__does_not_match?)) && 
+              (inst_methods.include?(:matches?) || inst_methods.include?(:does_not_match?))
 
-            def within(timeout)
-              @within_timeout = timeout
-              self
-            end
+              def within(timeout)
+                @within_timeout = timeout
+                self
+              end
 
-            def during(timeout)
-              @during_timeout = timeout
-              self
-            end
+              def during(timeout)
+                @during_timeout = timeout
+                self
+              end
 
-            def soon 
-              within(30)
-            end      
+              def soon 
+                within(30)
+              end      
 
-            def seconds
-              # for syntactic sugar
-              self
-            end
+              def seconds
+                # for syntactic sugar
+                self
+              end
 
-            alias_method :second, :seconds
+              alias_method :second, :seconds
 
-            def minutes
-              @within_timeout *= 60 if @within_timeout
-              @during_timeout *= 60 if @during_timeout
-              self
-            end
+              def minutes
+                @within_timeout *= 60 if @within_timeout
+                @during_timeout *= 60 if @during_timeout
+                self
+              end
 
-            alias_method :minute, :minutes
-          end
+              alias_method :minute, :minutes
+            end
 
-          if inst_methods.include? :matches?
-            alias_method :__matches?, :matches? 
+            if inst_methods.include? :matches?
+              alias_method :__matches?, :matches? 
 
-            def matches?(actual)
-              match_with_wait {__matches?(actual)}
+              def matches?(actual)
+                match_with_wait {__matches?(actual)}
+              end
             end
-          end
 
-          if inst_methods.include? :does_not_match?
-            alias_method :__does_not_match?, :does_not_match?
+            if inst_methods.include? :does_not_match?
+              alias_method :__does_not_match?, :does_not_match?
 
-            def does_not_match?(actual)
-              match_with_wait {__does_not_match?(actual)}
+              def does_not_match?(actual)
+                match_with_wait {__does_not_match?(actual)}
+              end
+            elsif inst_methods.include? :matches?
+              def does_not_match?(actual)
+                match_with_wait {!__matches?(actual)}
+              end
             end
-          elsif inst_methods.include? :matches?
-            def does_not_match?(actual)
-              match_with_wait {!__matches?(actual)}
-            end
-          end
 
-          private
-
-          def match_with_wait
-            if @within_timeout
-              timeout = @within_timeout; @within_timeout = nil
-              Watir::Wait.until(timeout) {yield} rescue false
-            elsif @during_timeout
-              timeout = @during_timeout; @during_timeout = nil
-              Watir::Wait.while(timeout) {yield} rescue true        
-            else
-              yield
+            private
+
+            def match_with_wait
+              if @within_timeout
+                timeout = @within_timeout; @within_timeout = nil
+                Watir::Wait.until(timeout) {yield} rescue false
+              elsif @during_timeout
+                timeout = @during_timeout; @during_timeout = nil
+                Watir::Wait.while(timeout) {yield} rescue true        
+              else
+                yield
+              end
             end
           end
         end
-      end
 
-      def file_path(file_name, description=nil)
-        formatter.file_path(file_name, description=nil)
-      end
+        def file_path(file_name, description=nil)
+          formatter.file_path(file_name, description=nil)
+        end
 
-      private
+        private
 
-      def formatter
-        @formatter ||= begin
-                         formatter = ::RSpec.configuration.formatters.find {|f| f.kind_of? Watir::RSpec::HtmlFormatter}
-                         unless formatter
-                           raise <<-EOF
-Watir::RSpec::HtmlFormatter is not set as a RSpec formatter.
+        def formatter
+          @formatter ||= begin
+                           formatter = ::RSpec.configuration.formatters.find {|f| f.kind_of? Watir::RSpec::HtmlFormatter}
+                           unless formatter
+                             raise <<-EOF
+  Watir::RSpec::HtmlFormatter is not set as a RSpec formatter.
 
-You need to add it into your spec_helper.rb file like this:
-  RSpec.configure do |config|
-    config.add_formatter('documentation')
-    config.add_formatter(Watir::RSpec::HtmlFormatter)
-  end
-EOF
+  You need to add it into your spec_helper.rb file like this:
+    RSpec.configure do |config|
+      config.add_formatter('documentation')
+      config.add_formatter(Watir::RSpec::HtmlFormatter)
+    end
+  EOF
+                           end
+                           formatter
                          end
-                         formatter
-                       end
-      end
+        end
 
 
-    end
+      end
 
+    end
   end
-end
 
-# patch for #within(timeout) method
-module ::RSpec::Matchers
-  class BuiltIn::Change
-    def matches?(event_proc)
-      raise_block_syntax_error if block_given?
+  # patch for #within(timeout) method
+  module ::RSpec::Matchers
+    class BuiltIn::Change
+      def matches?(event_proc)
+        raise_block_syntax_error if block_given?
 
-      # to make #change work with #in(timeout) method
-      unless defined? @actual_before
-        @actual_before = evaluate_value_proc
-        event_proc.call
-      end
-      @actual_after = evaluate_value_proc
+        # to make #change work with #in(timeout) method
+        unless defined? @actual_before
+          @actual_before = evaluate_value_proc
+          event_proc.call
+        end
+        @actual_after = evaluate_value_proc
 
-      (!change_expected? || changed?) && matches_before? && matches_after? && matches_expected_delta? && matches_min? && matches_max?
+        (!change_expected? || changed?) && matches_before? && matches_after? && matches_expected_delta? && matches_min? && matches_max?
+      end
     end
-  end
 
-  alias_method :make, :change
-end
+    alias_method :make, :change
+  end
 
-matchers = RSpec::Matchers::BuiltIn.constants.map(&:to_sym)
-matchers.delete :BaseMatcher
-matchers.each do |const|
-  Watir::RSpec.bootstrap RSpec::Matchers::BuiltIn.const_get const
-end
+  matchers = RSpec::Matchers::BuiltIn.constants.map(&:to_sym)
+  matchers.delete :BaseMatcher
+  matchers.each do |const|
+    Watir::RSpec.add_within_and_during_to_matcher RSpec::Matchers::BuiltIn.const_get const
+  end
 
-Watir::RSpec.bootstrap RSpec::Matchers::DSL::Matcher
+Watir::RSpec.add_within_and_during_to_matcher RSpec::Matchers::DSL::Matcher

data/lib/watir/rspec/helper.rb

@@ -3,11 +3,15 @@ module Watir
     module Helper
       extend Forwardable
 
+      def browser
+        @browser || $browser
+      end
+
       def method_missing name, *args #:nodoc:
-        if @browser.respond_to?(name)
+        if browser.respond_to?(name)
           Helper.module_eval %Q[
             def #{name}(*args)
-              @browser.send(:#{name}, *args) {yield}
+              browser.send(:#{name}, *args) {yield}
             end
           ]
           self.send(name, *args) {yield}
@@ -19,7 +23,7 @@ module Watir
       # make sure that using method 'p' will be invoked on browser
       # and not Kernel
       # use Kernel.p if you need to dump some variable 
-      def_delegators :@browser, :p
+      def_delegators :browser, :p
     end
   end
 end

data/lib/watir/rspec/version.rb

@@ -1,5 +1,5 @@
 module Watir
   class RSpec
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir-rspec
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec