rwebspec 1.4.0.1 → 1.4.0.2

data/lib/rwebspec/web_page.rb

@@ -1,94 +1,104 @@
-#***********************************************************
-#* Copyright (c) 2006, Zhimin Zhan.
-#* Distributed open-source, see full license in MIT-LICENSE
-#***********************************************************
-require File.join(File.dirname(__FILE__), 'assert')
-require File.join(File.dirname(__FILE__), 'driver')
-require 'fileutils'
-
-module RWebSpec
-
-  # WebPage (children of AbstractWebPage) encapsulates a real web page.
-  # For example,
-  #  beginAt("/home")
-  #  @web_browser.clickLinkWithText("/login")
-  #  @web_browser.setFormElement("username", "sa")
-  # Can be rewritten to
-  #  begin_at("/home")
-  #  home_page = HomePage.new
-  #  login_page = home_page.clickLoginLink
-  #  login_page.enterUserName("sa")
-  #
-  # So you only need change in LoingPage class if UI changes, which happen quite often.
-  class AbstractWebPage
-
-    include RWebSpec::Assert
-    include RWebSpec::Driver
-
-    # 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_text
-
-    def initialize(the_browser, page_text = nil)
-      @web_browser = the_browser
-      @web_tester = the_browser
-      @page_text = page_text
-      begin
-        snapshot if $ITEST2_DUMP_PAGE
-        delay = $ITEST2_PAGE_DELAY
-        sleep(delay)
-      rescue => e
-      end
-      assert_on_page
-    end
-
-    def browser
-      @web_browser
-    end
-
-    def assert_on_page()
-      assert_text_present(@page_text) if @page_text
-    end
-
-    def assert_not_on_page()
-      assert_text_not_present(@page_text) if @page_text
-    end
-
-    def dump(stream = nil)
-      @web_browser.dump_response(stream)
-    end
-
-    
-    def source
-      @web_browser.page_source
-    end
-    alias html source
-
-    # return current page title
-    def title
-      @web_browser.page_title
-    end
-
-    # return current page text
-    def text
-      @web_browser.text
-    end
-
-    # TO validate
-    def contains?(ary)
-      return true if ary.nil?
-      the_page_source = source
-      found = false
-      ary.each_line do |str|
-        found ||= the_page_source.include?(str)
-      end
-      return found
-    end
-
-    def	snapshot(replace_css = false)    
-      save_current_page(:filename => Time.now.strftime("%m%d%H%M%S") + "_" + self.class.name.gsub(" ", "") + ".html" )
-    end
-
-  end
-
-end
+#***********************************************************
+#* Copyright (c) 2006, Zhimin Zhan.
+#* Distributed open-source, see full license in MIT-LICENSE
+#***********************************************************
+require File.join(File.dirname(__FILE__), 'assert')
+require File.join(File.dirname(__FILE__), 'driver')
+require 'fileutils'
+
+module RWebSpec
+
+  # WebPage (children of AbstractWebPage) encapsulates a real web page.
+  # For example,
+  #  beginAt("/home")
+  #  @web_browser.clickLinkWithText("/login")
+  #  @web_browser.setFormElement("username", "sa")
+  # Can be rewritten to
+  #  begin_at("/home")
+  #  home_page = HomePage.new
+  #  login_page = home_page.clickLoginLink
+  #  login_page.enterUserName("sa")
+  #
+  # So you only need change in LoingPage class if UI changes, which happen quite often.
+  class AbstractWebPage
+
+    include RWebSpec::Assert
+    include RWebSpec::Driver
+
+    # 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_text
+
+    def initialize(the_browser, page_text = nil)
+      @web_browser = the_browser
+      @web_tester = the_browser
+      @page_text = page_text
+      begin
+        snapshot if $ITEST2_DUMP_PAGE
+        delay = $ITEST2_PAGE_DELAY
+        sleep(delay)
+      rescue => e
+      end
+      assert_on_page
+    end
+
+    # return the browser instance in page objects 
+    def browser
+      @web_browser
+    end
+
+    # Assert is on current page
+    # Example
+    #   home_page = HomePage.new("Welcome to iTest2")
+    #   ....
+    #   home_page.assert_on_page # will check the text 'Welcome to iTest2' still present on the page
+    def assert_on_page()
+      assert_text_present(@page_text) if @page_text
+    end
+
+    def assert_not_on_page()
+      assert_text_not_present(@page_text) if @page_text
+    end
+
+    def dump(stream = nil)
+      @web_browser.dump_response(stream)
+    end
+
+    # Page source (html)
+    def source
+      @web_browser.page_source
+    end
+    alias html source
+
+    # return current page title
+    def title
+      @web_browser.page_title
+    end
+
+    # return current page text
+    def text
+      @web_browser.text
+    end
+
+    # TO validate
+    def contains?(ary)
+      return true if ary.nil?
+      the_page_source = source
+      found = false
+      ary.each_line do |str|
+        found ||= the_page_source.include?(str)
+      end
+      return found
+    end
+
+    # Will save current page source to a file
+    #  home_page = HomePage.new("Welcome to iTest2")
+    #  ...
+    #  home_page.snapshot() # => save to 20090830100102_HomePage.html 
+    def	snapshot(replace_css = false)    
+      save_current_page(:filename => Time.now.strftime("%m%d%H%M%S") + "_" + self.class.name.gsub(" ", "") + ".html" )
+    end
+
+  end
+
+end

data/lib/rwebspec/web_testcase.rb

@@ -1,36 +1,38 @@
-#***********************************************************
-#* Copyright (c) 2006, Zhimin Zhan.
-#* Distributed open-source, see full license in MIT-LICENSE
-#***********************************************************
-
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'assert')
-require File.join(File.dirname(__FILE__), 'driver')
-
-module RWebSpec
-
-  class WebTestCase < Test::Unit::TestCase
-    include RWebSpec::Driver
-    include RWebSpec::Assert
-    include RWebSpec::Utils
-
-    attr_reader :web_tester
-
-    def initialize(name=nil)
-      super(name) if name
-      @web_browser = WebBrowser.new
-    end
-
-    def default_test
-      super unless (self.class == WebTestCase)
-    end
-
-    def open_browser(baseUrl, relativeUrl)
-      context.base_url = baseUrl
-      begin_at(relativeUrl)
-    end
-    alias open_ie open_browser
-
-  end
-
-end
+#***********************************************************
+#* Copyright (c) 2006, Zhimin Zhan.
+#* Distributed open-source, see full license in MIT-LICENSE
+#***********************************************************
+
+# Deprecated, use RSpec syntax instead
+
+require 'test/unit'
+require File.join(File.dirname(__FILE__), 'assert')
+require File.join(File.dirname(__FILE__), 'driver')
+
+module RWebSpec
+
+  class WebTestCase < Test::Unit::TestCase
+    include RWebSpec::Driver
+    include RWebSpec::Assert
+    include RWebSpec::Utils
+
+    attr_reader :web_tester
+
+    def initialize(name=nil)
+      super(name) if name
+      @web_browser = WebBrowser.new
+    end
+
+    def default_test
+      super unless (self.class == WebTestCase)
+    end
+
+    def open_browser(baseUrl, relativeUrl)
+      context.base_url = baseUrl
+      begin_at(relativeUrl)
+    end
+    alias open_ie open_browser
+
+  end
+
+end

data/lib/rwebspec.rb

@@ -1,31 +1,31 @@
-#***********************************************************
-#* Copyright (c) 2006 - 2009, Zhimin Zhan.
-#* Distributed open-source, see full license in MIT-LICENSE
-#***********************************************************
-
-# Load active_support, so that we can use 1.days.ago
-begin
-  require 'active_support/basic_object'
-  require 'active_support/duration'
-rescue LoadError => no_as1_err
-  # active_support 2.0 loaded error
-end
-require 'active_support/core_ext'
-require 'spec'
-
-RWEBSPEC_VERSION = RWEBUNIT_VERSION = "1.4.0.1"
-
-# Extra full path to load libraries
-require File.dirname(__FILE__) + "/rwebspec/using_pages"
-require File.dirname(__FILE__) + "/rwebspec/test_utils"
-require File.dirname(__FILE__) + "/rwebspec/web_page"
-require File.dirname(__FILE__) + "/rwebspec/assert"
-require File.dirname(__FILE__) + "/rwebspec/itest_plugin"
-require File.dirname(__FILE__) + "/rwebspec/web_browser"
-require File.dirname(__FILE__) + "/rwebspec/driver"
-require File.dirname(__FILE__) + "/rwebspec/test_script"
-require File.dirname(__FILE__) + "/rwebspec/context"
-require File.dirname(__FILE__) + "/rwebspec/rspec_helper"
-require File.dirname(__FILE__) + "/rspec_extensions"
-require File.dirname(__FILE__) + "/watir_extensions"
-require File.dirname(__FILE__) + "/rwebspec/matchers/contains_text"
+#***********************************************************
+#* Copyright (c) 2006 - 2009, Zhimin Zhan.
+#* Distributed open-source, see full license in MIT-LICENSE
+#***********************************************************
+
+# Load active_support, so that we can use 1.days.ago
+begin
+  require 'active_support/basic_object'
+  require 'active_support/duration'
+rescue LoadError => no_as1_err
+  # active_support 2.0 loaded error
+end
+require 'active_support/core_ext'
+require 'spec'
+
+RWEBSPEC_VERSION = RWEBUNIT_VERSION = "1.4.0.2"
+
+# Extra full path to load libraries
+require File.dirname(__FILE__) + "/rwebspec/using_pages"
+require File.dirname(__FILE__) + "/rwebspec/test_utils"
+require File.dirname(__FILE__) + "/rwebspec/web_page"
+require File.dirname(__FILE__) + "/rwebspec/assert"
+require File.dirname(__FILE__) + "/rwebspec/itest_plugin"
+require File.dirname(__FILE__) + "/rwebspec/web_browser"
+require File.dirname(__FILE__) + "/rwebspec/driver"
+require File.dirname(__FILE__) + "/rwebspec/test_script"
+require File.dirname(__FILE__) + "/rwebspec/context"
+require File.dirname(__FILE__) + "/rwebspec/rspec_helper"
+require File.dirname(__FILE__) + "/rspec_extensions"
+require File.dirname(__FILE__) + "/watir_extensions"
+require File.dirname(__FILE__) + "/rwebspec/matchers/contains_text"

data/lib/rwebunit.rb

@@ -1,3 +1,3 @@
-# legacy code to support old 'require rwebunit'
-require File.dirname(__FILE__) + "/rwebspec"
-RWebUnit = RWebSpec
+# legacy code to support old 'require rwebunit'
+require File.dirname(__FILE__) + "/rwebspec"
+RWebUnit = RWebSpec

data/lib/watir_extensions.rb

@@ -1,69 +1,69 @@
-if RUBY_PLATFORM == "java" then
-  # no need to load firefox extension
-else
-  module FireWatir
-    class Firefox
-
-      @@firefox_started = false
-
-      def initialize(options = {})
-        if(options.kind_of?(Integer))
-          options = {:waitTime => options}
-        end
-
-        if(options[:profile])
-          profile_opt = "-no-remote -P #{options[:profile]}"
-        else
-          profile_opt = ""
-        end
-
-        waitTime = options[:waitTime] || 2
-
-        case RUBY_PLATFORM
-        when /mswin/
-          # Get the path to Firefox.exe using Registry.
-          require 'win32/registry.rb'
-          path_to_bin = ""
-          Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Mozilla\Mozilla Firefox') do |reg|
-            keys = reg.keys
-            reg1 = Win32::Registry::HKEY_LOCAL_MACHINE.open("SOFTWARE\\Mozilla\\Mozilla Firefox\\#{keys[0]}\\Main")
-            reg1.each do |subkey, type, data|
-              if(subkey =~ /pathtoexe/i)
-                path_to_bin = data
-              end
-            end
-          end
-
-        when /linux/i
-          path_to_bin = `which firefox`.strip
-        when /darwin/i
-          path_to_bin = '/Applications/Firefox.app/Contents/MacOS/firefox'
-        when /java/
-          raise "Not implemented: Create a browser finder in JRuby"
-        end
-
-        @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")} unless @@firefox_started
-
-        sleep waitTime
-        begin
-          set_defaults()
-        rescue Watir::Exception::UnableToStartJSShException
-          if !@t # no new thread starting browser, try again
-            puts "Firefox with JSSH not detected after you indicated @@firefox_started"
-            @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")}
-            sleep waitTime
-            set_defaults
-          end
-        end
-        get_window_number()
-        set_browser_document()
-      end
-
-      def self.firefox_started=(value)
-        @@firefox_started = value
-      end
-
-    end
-  end
-
-end
+if RUBY_PLATFORM == "java" then
+  # no need to load firefox extension
+else
+  module FireWatir
+    class Firefox
+
+      @@firefox_started = false
+
+      def initialize(options = {})
+        if(options.kind_of?(Integer))
+          options = {:waitTime => options}
+        end
+
+        if(options[:profile])
+          profile_opt = "-no-remote -P #{options[:profile]}"
+        else
+          profile_opt = ""
+        end
+
+        waitTime = options[:waitTime] || 2
+
+        case RUBY_PLATFORM
+        when /mswin/
+          # Get the path to Firefox.exe using Registry.
+          require 'win32/registry.rb'
+          path_to_bin = ""
+          Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Mozilla\Mozilla Firefox') do |reg|
+            keys = reg.keys
+            reg1 = Win32::Registry::HKEY_LOCAL_MACHINE.open("SOFTWARE\\Mozilla\\Mozilla Firefox\\#{keys[0]}\\Main")
+            reg1.each do |subkey, type, data|
+              if(subkey =~ /pathtoexe/i)
+                path_to_bin = data
+              end
+            end
+          end
+
+        when /linux/i
+          path_to_bin = `which firefox`.strip
+        when /darwin/i
+          path_to_bin = '/Applications/Firefox.app/Contents/MacOS/firefox'
+        when /java/
+          raise "Not implemented: Create a browser finder in JRuby"
+        end
+
+        @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")} unless @@firefox_started
+
+        sleep waitTime
+        begin
+          set_defaults()
+        rescue Watir::Exception::UnableToStartJSShException
+          if !@t # no new thread starting browser, try again
+            puts "Firefox with JSSH not detected after you indicated @@firefox_started"
+            @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")}
+            sleep waitTime
+            set_defaults
+          end
+        end
+        get_window_number()
+        set_browser_document()
+      end
+
+      def self.firefox_started=(value)
+        @@firefox_started = value
+      end
+
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rwebspec
 version: !ruby/object:Gem::Version 
-  version: 1.4.0.1
+  version: 1.4.0.2
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -9,7 +9,7 @@ autorequire: rwebspec
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 +10:00
+date: 2009-09-01 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.12
     version: 
+- !ruby/object:Gem::Dependency 
+  name: firewatir
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.6.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: commonwatir
   type: :runtime
@@ -56,11 +66,13 @@ files:
 - CHANGELOG
 - MIT-LICENSE
 - lib/rspec_extensions.rb
+- lib/rwebspec
 - lib/rwebspec/assert.rb
 - lib/rwebspec/clickJSDialog.rb
 - lib/rwebspec/context.rb
 - lib/rwebspec/driver.rb
 - lib/rwebspec/itest_plugin.rb
+- lib/rwebspec/matchers
 - lib/rwebspec/matchers/contains_text.rb
 - lib/rwebspec/popup.rb
 - lib/rwebspec/rspec_helper.rb
@@ -75,8 +87,6 @@ files:
 - lib/watir_extensions.rb
 has_rdoc: true
 homepage: http://github.com/zhimin/rwebspec/tree/master
-licenses: []
-
 post_install_message: 
 rdoc_options: []
 
@@ -97,9 +107,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: rwebspec
-rubygems_version: 1.3.4
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Executable functional specification for web applications in RSpec syntax and Watir
 test_files: []