rwebunit 0.2.0 → 0.7.2

data/lib/rwebunit/web_page.rb

@@ -2,85 +2,77 @@
 #* 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')
 
 module RWebUnit
 
-   # WebPage (children of AbstractWebPage) encapsulates a real web page.
-   # For example,
-   #  beginAt("/home")
-   #  @browser.clickLinkWithText("/login")
-   #  @browser.setFormElement("username", "sa")
-   # Can be rewritten to
-   #  beginAt("/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
+  # WebPage (children of AbstractWebPage) encapsulates a real web page.
+  # For example,
+  #  beginAt("/home")
+  #  @browser.clickLinkWithText("/login")
+  #  @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
 
-      # browser: passed to do assertion within the page
-      # page_text: text used to identify the page, title will be the first candidate
-      attr_accessor :browser, :page_text
+    include RWebUnit::Assert
+    include RWebUnit::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 :browser, :page_text
 
-      def initialize(ie, page_text=nil)
-         @browser = ie
-         @page_text = page_text
-         assertOnPage
-      end
+    def initialize(web_tester, page_text=nil)
+      @web_tester = web_tester
+      @page_text = page_text
+      assert_on_page
+    end
 
-      def assertTextPresent(text)
-         @browser.assertTextPresent(text)
-      end
+    def browser
+      @web_tester
+    end
 
-      def assertTextInElement(elementID, text)
-         @browser.assertTextInElement(elementID, text)
-      end
+    def assert_on_page()
+      assert_text_present(@page_text) if @page_text
+    end
 
-      def assertOnPage()
-         assertTextPresent(@page_text) if @page_text
-      end
+    def assert_not_on_page()
+      assert_text_not_present(@page_text) if @page_text
+    end
 
-      def assertNotOnPage()
-         assertTextNotPresent(@page_text) if @page_text
-      end
+    def dump(stream = nil)
+      @web_tester.dump_response(stream)
+    end
 
-      def submit
-         @browser.submit
-      end
+    def source
+      @web_tester.page_source
+    end
 
-      def getElementValue(elementId)
-         @browser.getElemenValue(elementId)
-      end
+    def title
+      @web_tester.page_title
+    end
+
+    def expect_page(page_clazz)
+      page_clazz.new(@web_tester)
+    end
 
-      def dumpResponse(stream = nil)
-         @browser.dumpResponse(stream)
+    # TO validate
+    def contains?(ary)
+      page_source = source
+      found = false
+      ary.each do |str|
+        found ||= page_source.include?(str)
       end
+      return found
+    end
+    alias include contains?
 
-     # Wait for specific seconds for an Ajax update finish.
-      # Trick: In your Rails application,
-      #     :loading 	=> "Element.show('search_indicator');
-      #     :complete	=> "Element.hide('search_indicator');
-      #
-      #   <%= image_tag("indicator.gif", :id => 'search_indicator', :style => 'display:none') %>
-      #
-      # In your test case:
-      #    wait_ajax_update("search_indicator", "30)
-      #
-      # Warning: this method has not been fully tested, if you are not using Rails, change your parameter accordingly.
-      #
-      def wait_ajax_update(element_id, seconds)
-         count = 0
-         while count < (seconds / 2) do
-            search_indicator = @browser.getElementById(element_id)
-            search_indicator_outer_html = search_indicator.outerHtml if search_indicator
-            return true if search_indicator_outer_html && search_indicator_outer_html.include?('style="DISPLAY: none"')
-            sleep 2;
-            count = count + 1
-         end
-         return false
-       end
-       
-   end
+  end
 
 end

data/lib/rwebunit/web_testcase.rb

@@ -4,214 +4,33 @@
 #***********************************************************
 
 require 'test/unit'
+require File.join(File.dirname(__FILE__), 'assert')
+require File.join(File.dirname(__FILE__), 'driver')
 
 module RWebUnit
 
-   class WebTestCase < Test::Unit::TestCase
-      include RWebUnit::Utils
+  class WebTestCase < Test::Unit::TestCase
+    include RWebUnit::Driver
+    include RWebUnit::Assert
+    include RWebUnit::Utils
 
-      attr_reader :web_tester
+    attr_reader :web_tester
 
-      def initialize(name=nil)
-         super(name) if name
-         @web_tester = WebTester.new
-      end
+    def initialize(name=nil)
+      super(name) if name
+      @web_tester = WebTester.new
+    end
 
-      def default_test
-         super unless(self.class == WebTestCase)
-      end
+    def default_test
+      super unless (self.class == WebTestCase)
+    end
 
-      def getTestContext
-         @web_tester.test_context
-      end
+    def open_browser(baseUrl, relativeUrl)
+      test_context.base_url = baseUrl
+      begin_at(relativeUrl)
+    end
+    alias open_ie open_browser
 
-      def beginAt(url)
-         @web_tester.beginAt(url)
-      end
-
-      def openBrowser(baseUrl, relativeUrl)
-         getTestContext().base_url = baseUrl
-         beginAt(relativeUrl)
-      end
-
-      def closeBrowser
-         @web_tester.closeBrowser
-      end
-
-      def goBack()
-         @web_tester.goBack
-      end
-
-      def goForward()
-         @web_tester.goForward
-      end
-
-      def gotoPage(page)
-         @web_tester.gotoPage(page)
-      end
-
-      # assertions
-      def assertTitleEquals(title)
-         @web_tester.assertTitleEquals(title)
-      end
-
-      def assertTextPresent(text)
-         @web_tester.assertTextPresent(text)
-      end
-
-      def assertTextNotPresent(text)
-         @web_tester.assertTextNotPresent(text)
-      end
-
-      def assertTextInTable(tableId, text)
-         @web_tester.assertTextInTable(tableId, text)
-      end
-
-      def assertTextNotInTable(tableId, text)
-         @web_tester.assertTextNotInTable(tableId, text)
-      end
-
-      # textfields
-      def setFormElement(elementName, elementValue)
-         @web_tester.setFormElement(elementName, elementValue)
-      end
-
-      def assertTextPresentInTextField(textfieldName, text, msg = nil)
-         @web_tester.assertTextPresentInTextField(textfieldName, text, msg)
-      end
-
-      #links
-      def clickLinkWithText(linkText)
-         @web_tester.clickLinkWithText(linkText)
-      end
-
-      def assertLinkPresentWithText(linkText)
-         @web_tester.assertLinkPresentWithText(linkText)
-      end
-
-      def assertLinkNotPresentWithText(linkText)
-         @web_tester.assertLinkNotPresentWithText(linkText)
-      end
-
-      ##
-      # buttons
-
-      # submit the form using the first (index) submit button
-      def submit()
-         @web_tester.submit()
-      end
-
-      def submit(buttonId)
-         @web_tester.submit(buttonId)
-      end
-
-      def clickButton(buttonId)
-         @web_tester.clickButton(buttonId)
-      end
-
-      def clickButtonWithCaption(caption)
-         @web_tester.clickButtonWithCaption(caption)
-      end
-
-      def clickButtonWithValue(value)
-         @web_tester.clickButtonWithValue(value)
-      end
-
-      def assertButtonNotPresent(buttonID)
-         @web_tester.assertButtonNotPresent(buttonID)
-      end
-
-      def assertButtonNotPresentWithText(text)
-         @web_tester.assertButtonNotPresentWithText(text)
-      end
-
-      def assertButtonPresent(buttonID)
-         @web_tester.assertButtonPresent(buttonID)
-      end
-
-      def assertButtonPresentWithText(buttonID)
-         @web_tester.assertButtonPresentWithText(buttonID)
-      end
-
-      # checkbox
-      def checkCheckbox(checkBoxName)
-         @web_tester.checkCheckbox(checkBoxName)
-      end
-
-      def uncheckCheckbox(checkBoxName)
-         @web_tester.uncheckCheckbox(checkBoxName)
-      end
-
-      def assertCheckboxNotSelected(checkBoxName)
-         @web_tester.assertCheckboxNotSelected(checkBoxName)
-      end
-
-      def assertCheckboxSelected(checkBoxName)
-         @web_tester.assertCheckboxSelected(checkBoxName)
-      end
-
-      # radio button
-      def assertRadioOptionNotPresent(radioGroup, radioOption)
-         @web_tester.assertRadioOptionNotPresent(radioGroup, radioOption)
-      end
-
-      def assertRadioOptionPresent(radioGroup, radioOption)
-         @web_tester.assertRadioOptionPresent(radioGroup, radioOption)
-      end
-
-      def assertRadioOptionSelected(radioGroup, radioOption)
-         @web_tester.assertRadioOptionSelected(radioGroup, radioOption)
-      end
-
-      def assertRadioOptionNotSelected(radioGroup, radioOption)
-         @web_tester.assertRadioOptionNotSelected(radioGroup, radioOption)
-      end
-
-      # combo box
-      def selectOption(selectName, option)
-         @web_tester.selectOption(selectName, option)
-      end
-
-      # dhtml related
-      def assertElementPresent(elementID)
-         @web_tester.assertElementPresent(elementID)
-      end
-
-      def assertElementNotPresent(elementID)
-         @web_tester.assertElementNotPresent(elementID)
-      end
-
-      # Wait for specific seconds for an Ajax update finish.
-      # Trick: In your Rails application,
-      #     :loading 	=> "Element.show('search_indicator');
-      #     :complete	=> "Element.hide('search_indicator');
-      #
-      #   <%= image_tag("indicator.gif", :id => 'search_indicator', :style => 'display:none') %>
-      #
-      # In your test case:
-      #    wait_ajax_update("search_indicator", "30)
-      #
-      # Warning: this method has not been fully tested, if you are not using Rails, change your parameter accordingly.
-      #
-      def wait_ajax_update(element_id, seconds)
-         count = 0
-         while count < (seconds / 2) do
-            search_indicator = @web_tester.getElementById(element_id)
-            search_indicator_outer_html = search_indicator.outerHtml if search_indicator
-            return true if search_indicator_outer_html && search_indicator_outer_html.include?('style="DISPLAY: none"')
-            sleep 2;
-            count = count + 1
-         end
-         return false
-      end
-
-      # ---
-      # For deubgging
-      # ---
-      def dumpResponse(stream = nil)
-         @web_tester.dumpResponse(stream)
-      end
-
-   end
+  end
 
 end