druid-ts 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27a03ffe5425a835025a1c02f08ef841cbd92c8e
-  data.tar.gz: 170750f300df8637c4f852a5cca633c807cda376
+  metadata.gz: 69f2f0968bdcb0f4b0bf3bc82c40747118a2b2c8
+  data.tar.gz: d7e98d748da74a8936534b3a4b3a3b628130ff80
 SHA512:
-  metadata.gz: 275f0bb2a55c1c8be2cc5b65caf00f2e979b9ce35fd32037ab843e6466226c08112faaed5c46028994d1021846ca842d5510ece3a30734977fdaf4ef419e1c65
-  data.tar.gz: 32f20dcb1f4c488119a9b7ea3fc0f4714c58b91064d967a748c05adcb3134266595d0a0a8104f7f97f320e9a2f9139ea463358655411fef03b8acc6215c2685a
+  metadata.gz: a2b3000474fb1dc3ec20bc53e8bf452e49f90ef3d7cece31bd309136bb6e6dff6c7319bdecdbfb98598b7baa5a0fd83f56b4d46882ec8200bdf90a925fd8a17b
+  data.tar.gz: 84203743b392fd02051531e63209dc6581d83e6830995d091b9f8ef7a35cdcfe6bd8e25aec3c95b4a8cf5f7c65d994aff373d622f7d0631a4573e2a9d1e4fc2a

data/ChangeLog

@@ -1,6 +1,20 @@
+=== 2017-01-13
+* Enhancement
+  * Added callback to initialize_accessors method during initialization
+  * Added html method to Element
+  * Added generated method to return text for a table
+  * Added generated method to return text for an unordered list
+  * Added generated method to return text for an ordered list
+=== 2017-01-09
+* Enhancement
+  * Added params class instance variable to hold hash values that can be used in the page
+  * Added ability to insert ERB into page_url string and have it access params
+* Fixes
+  * Fixed issue when passing symbol to page_url and calling multiple times
 === 2017-01-03
 * Enhancement
   * Added selected_values method to SelectList to get values of all selected elements
+  * Added ability to pass classname as string to visit_page, on_page, and if_page methods
 === Version v1.1.5/ 2016-12-31
 * Enhancement
   * Added method to get the id of an Element

data/features/element.feature

@@ -20,6 +20,7 @@ Feature: Elements
     Then I should know it exists
     And I should know it is visible
     And I should know its' text is "Google Search"
+    And I should know the html is "<a href="success.html" id="link_id" name="link_name" class="link_class" title="link_title">Google Search</a>"
     And I should know it is equal to itself
     And I should know its' tag name is "a"
     And I should know the attribute "readonly" is false

data/features/html/static_elements.html

@@ -92,6 +92,9 @@
           <td>Data3</td>
           <td>Data4</td>
         </tr>
+        <tr>
+          <td>Data5</td>
+        </tr>
       </tbody>
     </table>
 

data/features/ordered_list.feature

@@ -40,3 +40,8 @@ Feature: Ordered list
     Then I should see that the ordered list exists
     When I get the first item from the list
     Then the list items text should be "Number One"
+
+  Scenario: Getting the text for an ordered list
+    Then the text for the ordered list should contain "Number One"
+    And the text for the ordered list should contain "Number Two"
+    And the text for the ordered list should contain "Number Three"

data/features/step_definations/element_steps.rb

@@ -130,3 +130,7 @@ end
 Then(/^I should know its id is "([^"]*)"$/) do |id|
   expect(@element.id).to eql id
 end
+
+Then(/^I should know the html is "(.*)"$/) do |html|
+  expect(@element.html).to eql html
+end

data/features/step_definations/ordered_list_steps.rb

@@ -43,3 +43,7 @@ end
 Then(/^I should see that the ordered list exists$/) do
   expect(@page.ol_id?).to be true
 end
+
+Then(/^the text for the ordered list should contain "([^"]*)"$/) do |text|
+  expect(@page.send("ol_id")).to include text
+end

data/features/step_definations/table_steps.rb

@@ -75,3 +75,7 @@ end
 When(/^I retrieve a table with thead element$/) do
   @element = @page.table_with_thead_id_element
 end
+
+Then(/^I should see the text includes "([^"]*)" when I retrieve it by "([^"]*)"$/) do |text, how|
+  expect(@page.send("table_#{how}")).to include text
+end

data/features/step_definations/unordered_list_steps.rb

@@ -21,3 +21,7 @@ end
 Then(/^I should see that the unordered list exists$/) do
   expect(@page.ul_id?).to be true
 end
+
+Then(/^the text for the unordered list should contain "([^"]*)"$/) do |text|
+  expect(@page.send("ul_id")).to include text
+end

data/features/table.feature

@@ -45,6 +45,11 @@ Feature: Table
   Scenario: Retrieve data from a table with an incorrect column header
     When I retrieve a table element
     Then the data for row "Data3" and column "Data20" should be nil
+
+  Scenario: Retrieve data from a table that does not have a cell which corresponds to a column header
+    When I retrieve a table with thead element
+    Then the data for row "Data5" and column "Col2" should be nil
+
   @name
   Scenario Outline: Locating table cells on the Page
     When I retrieve a table element by "<locate_by>"
@@ -92,3 +97,7 @@ Feature: Table
   Scenario: Retrieve data from the first row of a table with a thead using a column header
     When I retrieve a table with thead element
     Then the data for column "Col1" and row "1" should be "Col1"
+
+  Scenario: Getting the text from a table
+    Then I should see the text includes "Data1" when I retrieve it by "id"
+    And I should see the text includes "Data2" when I retrieve it by "id"

data/features/unordered_list.feature

@@ -41,3 +41,8 @@ Feature: Unordered list
     Then I should see that the unordered list exists
     When I get the first item from the list
     Then the list items text should be "Item One"
+
+  Scenario: Getting the text from an unordered list
+    Then the text for the unordered list should contain "Item One"
+    And the text for the unordered list should contain "Item Two"
+    And the text for the unordered list should contain "Item Three"

data/lib/druid.rb

@@ -43,13 +43,15 @@ module Druid
   # @return [Watir::Browser] the drvier passed to the constructor
   attr_reader :driver
   #
-  # Construct a new druid. Upon initialization of the page it will call a method named
-  # initialize_page if it exists
+  # Construct a new druid. Prior to browser initialization it will call
+  # a method named initialize_accessors if it exists. Upon initialization of
+  # the page it will call a method named initialize_page if it exists
   #
   # @param [Watir::Browser] the driver to use
   # @param [bool] open the page if page_url is set
   #
   def initialize(driver, visit=false)
+    initialize_accessors if respond_to?(:initialize_accessors)
     if driver.is_a? Watir::Browser
       @driver ||= driver
       goto if visit && respond_to?(:goto)

data/lib/druid/accessors.rb

@@ -1,4 +1,5 @@
 require 'druid/elements'
+require 'erb'
 
 module Druid
   #
@@ -7,6 +8,25 @@ module Druid
   # set of methods that provide access to the elements on the web pages.
   #
   module Accessors
+
+    #
+    # Set some values that can be used withing the class. This is
+    # typically used to provided values that help build dynamic urls in
+    # the page_url method
+    #
+    # @param [Hash] the value to set the params
+    #
+    def params=(the_params)
+      @params = the_params
+    end
+
+    #
+    # Return the params that exist on this page class
+    #
+    def params
+      @params ||= {}
+    end
+
     #
     # Specify the url for the page.  A call to this method will generate a
     # 'goto' method to take you to the page.
@@ -16,8 +36,11 @@ module Druid
     #
     def page_url(url)
       define_method("goto") do
-        url = url.kind_of?(Symbol) ? self.send(url) : url
-        driver.goto url
+        lookup = url.kind_of?(Symbol) ? self.send(url) : url
+        erb = ERB.new(%Q{#{lookup}})
+        merged_params = self.class.instance_variable_get("@merged_params")
+        params = merged_params ? merged_params : self.class.params
+        driver.goto erb.result(binding)
       end
     end
     alias_method :direct_url, :page_url
@@ -408,12 +431,13 @@ module Druid
     end
 
     #
-    # adds two methods - one to retrieve the table element, and another to
+    # adds three methods - one to retrieve the text for the table, one
+    # to retrieve the table element, and another to
     # check the table's existence.
     #
     # @example
     #   table(:cart, :id => 'shopping_cart')
-    #   # will generate a 'cart_element' and 'cart?' method
+    #   # will generate a 'cart', 'cart_element' and 'cart?' method
     #
     # @param the name used for the generated methods
     # @param identifier how we find a table. You can use a multiple parameters
@@ -426,6 +450,10 @@ module Druid
     # @param optional block to be invoked when element method is called
     #
     def table(name, identifier={:index => 0}, &block)
+      define_method(name) do
+        return table_text_for identifier.clone unless block_given?
+        self.send("#{name}_element").text
+      end
       define_method("#{name}_element") do
         return call_block(&block) if block_given?
         table_for(identifier.clone)
@@ -657,12 +685,13 @@ module Druid
     alias_method :li, :list_item
 
     #
-    # adds two methods - one to retrieve the ordered list element, and another to
+    # adds three methods - one to return the text within the ordered
+    # list, one to retrieve the ordered list element, and another to
     # test it's existence.
     #
     # @example
     #   ordered_list(:top_five, :id => 'top')
-    #   # will generate 'top_five_element' and 'top_five?' methods
+    #   # will generate 'top_five' 'top_five_element' and 'top_five?' methods
     #
     # @param [Symbol] the name used for the generated methods
     # @param [Hash] identifier how we find an ordered list. You can use a multiple parameters
@@ -675,6 +704,10 @@ module Druid
     # @param optional block to be invoked when element method is called
     #
     def ordered_list(name, identifier={:index => 0}, &block)
+      define_method(name) do
+        return ordered_list_text_for identifier.clone unless block_given?
+        self.send("#{name}_element").text
+      end
       define_method("#{name}_element") do
         return call_block(&block) if block_given?
         ordered_list_for(identifier.clone)
@@ -731,12 +764,12 @@ module Druid
     alias_method :textarea, :text_area
 
     #
-    # adds two methods - one to retrieve the unordered list element, and another to
-    # check it's existence.
+    # adds three methods - one to return the text of unordered list, another one
+    # retrieve the unordered list element, and another to check it's existence.
     #
     # @example
     #   unordered_list(:menu, :id => 'main_menu')
-    #   # will generate 'menu_element' and 'menu?' methods
+    #   # will generate 'menu' 'menu_element' and 'menu?' methods
     #
     # @param [Symbol] the name used for the generated methods
     # @param [Hash] identifier how we find an unordered list. You can use a multiple parameters
@@ -748,6 +781,10 @@ module Druid
     #   * :name
     # @param optional block to be invoked when element method is called
     def unordered_list(name, identifier={:index => 0}, &block)
+      define_method(name) do
+        return unordered_list_text_for identifier.clone unless block_given?
+        self.send("#{name}_element").text
+      end
       define_method("#{name}_element") do
         return call_block(&block) if block_given?
         unordered_list_for(identifier.clone)

data/lib/druid/assist.rb

@@ -129,6 +129,13 @@ module Druid
       find_elements("divs(identifier)", Elements::Div, identifier, 'div')
     end
 
+    #
+    # method to return the text for a table
+    #
+    def table_text_for(identifier)
+      process_call("table(identifier).text", Elements::Table, identifier, nil, 'table')
+    end
+
     def table_for identifier
       find_element("table(identifier)", Elements::Table, identifier, 'table')
     end
@@ -222,6 +229,13 @@ module Druid
       find_elements("lis(identifier)", Elements::ListItem, identifier, 'li')
     end
 
+    #
+    # method to retrieve the text from an ordered list
+    #
+    def ordered_list_text_for(identifier)
+      process_call("ol(identifier).text", Elements::OrderedList, identifier, nil, 'ol')
+    end
+
     def ordered_list_for identifier
       find_element("ol(identifier)", Elements::OrderedList, identifier, 'ol')
     end
@@ -250,6 +264,13 @@ module Druid
       find_elements("textareas(identifier)", Elements::TextArea, identifier)
     end
 
+    #
+    # method to retrieve the text from an unordered list
+    #
+    def unordered_list_text_for(identifier)
+      process_call("ul(identifier).text", Elements::UnOrderedList, identifier, nil, 'ul')
+    end
+
     def unordered_list_for identifier
       find_element("ul(identifier)", Elements::UnOrderedList, identifier, 'ul')
     end

data/lib/druid/elements/element.rb

@@ -44,6 +44,15 @@ module Druid
         element.visible?
       end
 
+      #
+      # Get the html for the element
+      #
+      # @return [String]
+      #
+      def html
+        element.html
+      end
+
       #
       # Get the value of this element
       #

data/lib/druid/elements/table_row.rb

@@ -9,7 +9,7 @@ module Druid
       #
       def [](idx)
         idx = find_index_by_title(idx) if idx.kind_of?(String)
-        return nil unless idx
+        return nil unless idx && columns >= idx + 1
         Druid::Elements::TableCell.new(element[idx])
       end
       #

data/lib/druid/page_factory.rb

@@ -34,11 +34,14 @@ module Druid
     # Create and navigate to a page object.  The navigation will only work if the
     # 'page_url' method was call on the page object.
     #
-    # @param [page_class] a class that has included the Druid module
+    # @param [PageObject, String] a class that has included the Druid module or a string containing the name of the class
     # @param an optional block to be called
     # @return [PageObject] the newly created page object
     #
-    def visit_page(page_class, &block)
+    def visit_page(page_class, params={:using_params => {}}, &block)
+      page_class = class_from_string(page_class) if page_class.is_a? String
+      merged = page_class.params.merge(params[:using_params])
+      page_class.instance_variable_set("@merged_params", merged) unless merged.empty?
       on_page page_class, true, &block
     end
 
@@ -47,12 +50,13 @@ module Druid
     #
     # Create a page object.
     #
-    # @param [page_class] a class that has included the Druid module
+    # @param [PageObject, String] a class that has included the Druid module or a string containing the name of the class
     # @param [Bool] should the page be visited?  default is false.
     # @param an optional block to be called
     # @return [PageObject] the newly created page object
     #
     def on_page(page_class, visit=false, &block)
+      page_class = class_from_string(page_class) if page_class.is_a? String
       @current_page = page_class.new(@driver, visit)
       block.call @current_page if block
       @current_page
@@ -73,12 +77,13 @@ module Druid
     #      page.save
     #   end
     #   if_page EditProduct do |page|
-    #      page.update 
+    #      page.update
     #   end
-    # @param [PageObject] a class that has included the Druid module
+    # @param [PageObject, String] a class that has included the Druid module or a string containing the name of the class
     # @param [block] an optional block to be called
     # @return [PageObject] the newly created page object
     def if_page(page_class, &block)
+      page_class = class_from_string(page_class) if page_class.is_a? String
       return @current_page unless @current_page.class == page_class
       on_page(page_class, false, &block)
     end
@@ -136,6 +141,12 @@ module Druid
 
     private
 
+    def class_from_string(str)
+      str.split('::').inject(Object) do |mod, class_name|
+        mod.const_get(class_name)
+      end
+    end
+
     def path_for(how)
       path = Druid::PageFactory.page_object_routes[how[:using]]
       fail("PageFactory route :#{how[:using].to_s} not found") unless path

data/lib/druid/version.rb

@@ -1,3 +1,3 @@
 module Druid
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

data/spec/druid/accessors_spec.rb

@@ -149,12 +149,18 @@ describe Druid::Accessors do
       class SymbolPageUrl
         include Druid
         page_url :custom_url
-        def custom_url
-          'custom'
+
+        attr_reader :custom_url
+
+        def initialize(d, v, url)
+          @custom_url = url
+          super(d, v)
         end
       end
       expect(driver).to receive(:goto).with("custom")
-      SymbolPageUrl.new(driver, true)
+      SymbolPageUrl.new(driver, true, 'custom')
+      expect(driver).to receive(:goto).with('different')
+      SymbolPageUrl.new(driver, true, 'different')
     end
 
     it "should not navigate to a page when not requested" do

data/spec/druid/druid_spec.rb

@@ -8,6 +8,68 @@ describe Druid do
   let(:driver) { mock_driver }
   let(:druid) { TestDruid.new(driver) }
 
+  context "setting values on the Druid module" do
+    it "should set the javascript framework" do
+      expect(Druid::JavascriptFrameworkFacade).to receive(:framework=)
+      Druid.javascript_framework = :foo
+    end
+
+    it "should add the javascript framework" do
+      expect(Druid::JavascriptFrameworkFacade).to receive(:add_framework)
+      Druid.add_framework(:foo, :bar)
+    end
+
+    it "should set a default page wait value" do
+      Druid.default_page_wait = 20
+      wait = Druid.instance_variable_get("@page_wait")
+      expect(wait).to eql 20
+    end
+
+    it "should provide the default page wait value" do
+      Druid.instance_variable_set("@page_wait", 10)
+      expect(Druid.default_page_wait).to eql 10
+    end
+
+    it "should default the page wait value to 30" do
+      Druid.instance_variable_set("@page_wait", nil)
+      expect(Druid.default_page_wait).to eql 30
+    end
+
+    it "should set the default element wait value" do
+      Druid.default_element_wait = 20
+      wait = Druid.instance_variable_get("@element_wait")
+      expect(wait).to eql 20
+    end
+
+    it "should provide the default element wait value" do
+      Druid.instance_variable_set("@element_wait", 10)
+      expect(Druid.default_element_wait).to eql 10
+    end
+
+    it "should default the element wait to 5" do
+      Druid.instance_variable_set("@element_wait", nil)
+      expect(Druid.default_element_wait).to eql 5
+    end
+  end
+
+  context "setting values on the Druid class instance" do
+    it "should set the params value" do
+      TestDruid.params = {:some => :value}
+      params = TestDruid.instance_variable_get("@params")
+      expect(params[:some]).to eql :value
+    end
+
+    it "should provide the params value" do
+      TestDruid.instance_variable_set("@params", {:value => :updated})
+      expect(TestDruid.params[:value]).to eql :updated
+    end
+
+    it "should default the params to an empty hash" do
+      TestDruid.instance_variable_set("@params", nil)
+      expect(TestDruid.params).to eql Hash.new
+    end
+  end
+
   context "when created with a watir-webdriver browser" do
     it "should include the Druid module" do
       expect(druid).to be_kind_of Druid
@@ -127,15 +189,47 @@ describe Druid do
       it "should call intialize_page if it exists" do
         class CallbackPage
           include Druid
-          attr_reader :initialize_page
+          attr_reader :initialize_page_called
 
           def initialize_page
-            @initialize_page = true
+            @initialize_page_called = true
           end
         end
 
         page = CallbackPage.new(driver)
-        expect(page.initialize_page).to be true
+        expect(page.initialize_page_called).to be true
+      end
+
+      it "should call initialize_accessors if it exists" do
+        class CallbackPage
+          include Druid
+          attr_reader :initialize_accessors_called
+
+          def initialize_accessors
+            @initialize_accessors_called = true
+          end
+        end
+
+        @page = CallbackPage.new(driver)
+        expect(@page.initialize_accessors_called).to be true
+      end
+
+      it "should call initialize_accessors before initialize_page if both exist" do
+        class CallbackPage
+          include Druid
+          attr_reader :initialize_page, :initialize_accessors
+
+          def initialize_page
+            @initialize_page = Time.now
+          end
+
+          def initialize_accessors
+            @initialize_accessors = Time.now
+          end
+        end
+
+        @page = CallbackPage.new(driver)
+        expect(@page.initialize_accessors.usec).to be < @page.initialize_page.usec
       end
 
       it "should convert a modal popup to a window" do
@@ -166,16 +260,6 @@ describe Druid do
         druid.wait_for_ajax
       end
 
-      it "should set the javascript framework" do
-        expect(Druid::JavascriptFrameworkFacade).to receive(:framework=)
-        Druid.javascript_framework = :foo
-      end
-
-      it "should add the javascript framework" do
-        expect(Druid::JavascriptFrameworkFacade).to receive(:add_framework)
-        Druid.add_framework(:foo, :bar)
-      end
-
       it "should execute javascript on the browser" do
         expect(driver).to receive(:execute_script).and_return("abc")
         expect(druid.execute_script("333")).to eql "abc"

data/spec/druid/elements/table_row_spec.rb

@@ -15,6 +15,7 @@ describe Druid::Elements::TableRow do
     let(:table_row) { Druid::Elements::TableRow.new(element) }
 
     it "should return a table cell when indexed" do
+      allow(table_row).to receive(:columns).and_return(2)
       expect(element).to receive(:[]).with(1)
       expect(table_row[1]).to be_instance_of Druid::Elements::TableCell
     end

data/spec/druid/page_factory_spec.rb

@@ -19,6 +19,13 @@ class YetAnotherPage
   include Druid
 end
 
+module ContainingModule
+  class PageInsideModule
+    include Druid
+    page_url "http://google.co.uk"
+  end
+end
+
 class TestWorld
   include Druid::PageFactory
 
@@ -26,7 +33,6 @@ class TestWorld
   attr_accessor :current_page
 end
 
-
 describe Druid::PageFactory do
 
   let(:world) { TestWorld.new }
@@ -40,6 +46,12 @@ describe Druid::PageFactory do
     world.on_page FactoryTestDruid do |page|
       expect(page).to be_instance_of FactoryTestDruid
     end
+    world.on_page "FactoryTestDruid" do |page|
+      expect(page).to be_instance_of FactoryTestDruid
+    end
+    world.on_page "ContainingModule::PageInsideModule" do |page|
+      expect(page).to be_instance_of ContainingModule::PageInsideModule
+    end
   end
 
   it "should create a new page object and execute a block using 'on'" do
@@ -47,20 +59,65 @@ describe Druid::PageFactory do
     world.on FactoryTestDruid do |page|
       expect(page).to be_instance_of FactoryTestDruid
     end
+    world.on "FactoryTestDruid" do |page|
+      expect(page).to be_instance_of FactoryTestDruid
+    end
+    world.on "ContainingModule::PageInsideModule" do |page|
+      expect(page).to be_instance_of ContainingModule::PageInsideModule
+    end
   end
 
   it "should create and visit a new page" do
-    expect(driver).to receive(:goto)
+    expect(driver).to receive(:goto).exactly(3).times
     world.visit_page FactoryTestDruid do |page|
       expect(page).to be_instance_of FactoryTestDruid
     end
+    world.visit_page "FactoryTestDruid" do |page|
+      expect(page).to be_instance_of FactoryTestDruid
+    end
+    world.visit_page "ContainingModule::PageInsideModule" do |page|
+      expect(page).to be_instance_of ContainingModule::PageInsideModule
+    end
   end
 
-  it "should create and visit a new page using 'visit'" do
+  it "should merge params with the class level params if provided when visiting" do
     expect(driver).to receive(:goto)
+    FactoryTestDruid.params = {:initial => :value}
+    world.visit_page(FactoryTestDruid, :using_params => {:new_value => :merged})
+    merged = FactoryTestDruid.instance_variable_get("@merged_params")
+    expect(merged[:initial]).to eql :value
+    expect(merged[:new_value]).to eql :merged
+  end
+
+  it "should use the params in the url when they are provided" do
+    class PageUsingParams
+      include Druid
+      page_url "http://google.com/<%=params[:value]%>"
+    end
+    expect(driver).to receive(:goto).with("http://google.com/Druid")
+    world.visit_page(PageUsingParams, :using_params => {:value => 'Druid'})
+  end
+
+  it "should use the params as well as interpolated values" do
+    class PageUsingParamsAndInterpolated
+      include Druid
+      page_url "http://google.com/#{1+2}/<%=params[:value]%>"
+    end
+    expect(driver).to receive(:goto).with("http://google.com/3/Druid")
+    world.visit_page(PageUsingParamsAndInterpolated, :using_params => {:value => 'Druid'})
+  end
+
+  it "should create and visit a new page using 'visit'" do
+    expect(driver).to receive(:goto).exactly(3).times
     world.visit FactoryTestDruid do |page|
       expect(page).to be_instance_of FactoryTestDruid
     end
+    world.visit "FactoryTestDruid" do |page|
+      expect(page).to be_instance_of FactoryTestDruid
+    end
+    world.visit "ContainingModule::PageInsideModule" do |page|
+      expect(page).to be_instance_of ContainingModule::PageInsideModule
+    end
   end
 
   it "should create and visit a new page when url is defined as 'direct_url'" do
@@ -82,20 +139,44 @@ describe Druid::PageFactory do
     world.if_page(FactoryTestDruid) do |page|
       fail
     end
+    world.if_page("FactoryTestDruid") do |page|
+      fail
+    end
+    world.if_page("ContainingModule::PageInsideModule") do |page|
+      fail
+    end
   end
 
   it "should return the @current_page if asking for another page" do
     expected = TestPageWithDirectUrl.new(driver)
     world.instance_variable_set "@current_page", expected
     expect(world.if_page(FactoryTestDruid)).to be expected
+    expect(world.if_page("FactoryTestDruid")).to be expected
+    expect(world.if_page("ContainingModule::PageInsideModule")).to be expected
   end
 
-  # it "should execute the block when we ask if it is the correct page" do
-  #   world.instance_variable_set "@current_page", FactoryTestDruid.new(driver)
-  #   world.if_page(FactoryTestDruid) do |page|
-  #     expect(page).to be_instance_of FactoryTestDruid
-  #   end
-  # end
+  it "should execute the block when we ask if it is the correct page" do
+    world.instance_variable_set "@current_page", FactoryTestDruid.new(driver)
+    done = false
+    world.if_page(FactoryTestDruid) do |page|
+      expect(page).to be_instance_of FactoryTestDruid
+      done = true
+    end
+    expect(done).to be true
+    done = false
+    world.if_page("FactoryTestDruid") do |page|
+      expect(page).to be_instance_of FactoryTestDruid
+      done = true
+    end
+    expect(done).to be true
+    done = false
+    world.instance_variable_set "@current_page", ContainingModule::PageInsideModule.new(driver)
+    world.if_page("ContainingModule::PageInsideModule") do |page|
+      expect(page).to be_instance_of ContainingModule::PageInsideModule
+      done = true
+    end
+    expect(done).to be true
+  end
 
   it "should raise an error when you do not provide a default route" do
     expect { Druid::PageFactory.routes = {:another => []} }.to raise_error 'You must provide a :default route for PageFactory routes'

data/spec/spec_helper.rb

@@ -3,6 +3,6 @@ require "watir-webdriver"
 
 def mock_driver
   driver = double('watir')
-  expect(driver).to receive(:is_a?).with(Watir::Browser).and_return(true)
+  allow(driver).to receive(:is_a?).with(Watir::Browser).and_return(true)
   driver
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: druid-ts
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Tim Sheng