page-object 1.0.2 → 1.0.3

data/spec/page-object/elements/span_spec.rb

@@ -8,19 +8,19 @@ describe PageObject::Elements::Span do
     it "should map watir types to same" do
       [:class, :id, :index, :text, :title, :xpath].each do |t|
         identifier = span.watir_identifier_for t => 'value'
-        identifier.keys.first.should == t
+        expect(identifier.keys.first).to eql t
       end
     end
 
     it "should map selenium types to same" do
       [:class, :id, :index, :name, :text, :title, :xpath].each do |t|
         key, value = span.selenium_identifier_for t => 'value'
-        key.should == t
+        expect(key).to eql t
       end
     end
   end
 
   it "should register with tag_name :span" do
-    ::PageObject::Elements.element_class_for(:span).should == ::PageObject::Elements::Span
+    expect(::PageObject::Elements.element_class_for(:span)).to eql ::PageObject::Elements::Span
   end
 end

data/spec/page-object/elements/table_cell_spec.rb

@@ -5,17 +5,17 @@ describe PageObject::Elements::TableCell do
 
   context "interface" do
     it "should register with tag_name :td" do
-      ::PageObject::Elements.element_class_for(:td).should == ::PageObject::Elements::TableCell
+      expect(::PageObject::Elements.element_class_for(:td)).to eql ::PageObject::Elements::TableCell
     end
 
     it "should register with tag_name :th" do
-      ::PageObject::Elements.element_class_for(:th).should == ::PageObject::Elements::TableCell
+      expect(::PageObject::Elements.element_class_for(:th)).to eql ::PageObject::Elements::TableCell
     end
 
     it "should always be enabled" do
       table_cell_element = double('table_cell_element')
       table_cell = PageObject::Elements::TableCell.new(table_cell_element, :platform => :selenium_webdriver)
-      table_cell.enabled?.should be true
+      expect(table_cell.enabled?).to be true
     end
   end
 end

data/spec/page-object/elements/table_row_spec.rb

@@ -8,62 +8,62 @@ describe PageObject::Elements::TableRow do
   describe "interface" do
 
     it "should register with tag_name :tr" do
-      ::PageObject::Elements.element_class_for(:tr).should == ::PageObject::Elements::TableRow
+      expect(::PageObject::Elements.element_class_for(:tr)).to eql ::PageObject::Elements::TableRow
     end
     
     context "for selenium" do
       it "should return a table cell when indexed" do
         table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :selenium_webdriver)
-        table_row.stub(:columns).and_return(2)
-        table_row_driver.should_receive(:find_elements).with(:xpath, ".//child::td|th").and_return(table_cell)
-        table_cell.should_receive(:[]).and_return(table_cell)
-        table_row[0].should be_instance_of PageObject::Elements::TableCell
+        allow(table_row).to receive(:columns).and_return(2)
+        expect(table_row_driver).to receive(:find_elements).with(:xpath, ".//child::td|th").and_return(table_cell)
+        expect(table_cell).to receive(:[]).and_return(table_cell)
+        expect(table_row[0]).to be_instance_of PageObject::Elements::TableCell
       end
 
       it "should retrun the number of columns" do
         table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :selenium_webdriver)
-        table_row_driver.should_receive(:find_elements).with(:xpath, ".//child::td|th").and_return(table_row_driver)
-        table_row_driver.should_receive(:size).and_return(3)
-        table_row.columns.should == 3
+        expect(table_row_driver).to receive(:find_elements).with(:xpath, ".//child::td|th").and_return(table_row_driver)
+        expect(table_row_driver).to receive(:size).and_return(3)
+        expect(table_row.columns).to eql 3
       end
 
       it "should iterate over the table columns" do
         table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :selenium_webdriver)
-        table_row.should_receive(:columns).and_return(2)
-        table_row.stub(:[]).and_return(table_row_driver)
+        expect(table_row).to receive(:columns).and_return(2)
+        allow(table_row).to receive(:[]).and_return(table_row_driver)
         count = 0
         table_row.each { |e| count += 1 }
-        count.should == 2
+        expect(count).to eql 2
       end
     end
 
     context "for watir" do
       before(:each) do
-        table_row_driver.stub(:find_elements).and_return(table_row_driver)
+        allow(table_row_driver).to receive(:find_elements).and_return(table_row_driver)
       end
 
       it "should return a table cell when indexed" do
         table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :watir_webdriver)
-        table_row.stub(:columns).and_return(2)
-        table_row_driver.should_receive(:[]).with(1).and_return(table_cell)
-        table_row[1].should be_instance_of PageObject::Elements::TableCell
+        allow(table_row).to receive(:columns).and_return(2)
+        expect(table_row_driver).to receive(:[]).with(1).and_return(table_cell)
+        expect(table_row[1]).to be_instance_of PageObject::Elements::TableCell
       end
 
       it "should return the number of columns" do
         table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :watir_webdriver)
-        table_row_driver.stub(:wd).and_return(table_row_driver)
-        table_row_driver.should_receive(:find_elements).with(:xpath, ".//child::td|th").and_return(table_row_driver)
-        table_row_driver.should_receive(:size).and_return(3)
-        table_row.columns.should == 3
+        allow(table_row_driver).to receive(:wd).and_return(table_row_driver)
+        expect(table_row_driver).to receive(:find_elements).with(:xpath, ".//child::td|th").and_return(table_row_driver)
+        expect(table_row_driver).to receive(:size).and_return(3)
+        expect(table_row.columns).to eql 3
       end
 
       it "should iterate over the table columns" do
         table_row = PageObject::Elements::TableRow.new(table_row_driver, :platform => :watir_webdriver)
-        table_row.should_receive(:columns).and_return(2)
-        table_row.stub(:[])
+        expect(table_row).to receive(:columns).and_return(2)
+        allow(table_row).to receive(:[])
         count = 0
         table_row.each { |e| count += 1 }
-        count.should == 2
+        expect(count).to eql 2
       end
     end
   end

data/spec/page-object/elements/table_spec.rb

@@ -6,14 +6,14 @@ describe PageObject::Elements::Table do
     it "should map watir types to same" do
       [:class, :id, :index, :xpath].each do |t|
         identifier = PageObject::Elements::Table.watir_identifier_for t => 'value'
-        identifier.keys.first.should == t
+        expect(identifier.keys.first).to eql t
       end
     end
 
     it "should map selenium types to same" do
       [:class, :id, :index, :name, :xpath].each do |t|
         key, value = PageObject::Elements::Table.selenium_identifier_for t => 'value'
-        key.should == t
+        expect(key).to eql t
       end
     end
   end
@@ -22,44 +22,44 @@ describe PageObject::Elements::Table do
     let(:table_element) { double('table_element') }
 
     before(:each) do
-      table_element.stub(:[]).and_return(table_element)
-      table_element.stub(:find_elements).and_return(table_element)
+      allow(table_element).to receive(:[]).and_return(table_element)
+      allow(table_element).to receive(:find_elements).and_return(table_element)
     end
 
     it "should register with tag_name :table" do
-      ::PageObject::Elements.element_class_for(:table).should == ::PageObject::Elements::Table
+      expect(::PageObject::Elements.element_class_for(:table)).to eql ::PageObject::Elements::Table
     end
 
     context "for watir" do
       let(:watir_table) { PageObject::Elements::Table.new(table_element, :platform => :watir_webdriver) }
       
       it "should return a table row when indexed" do
-        table_element.stub(:[]).with(1).and_return(table_element)
-        watir_table[1].should be_instance_of PageObject::Elements::TableRow
+        allow(table_element).to receive(:[]).with(1).and_return(table_element)
+        expect(watir_table[1]).to be_instance_of PageObject::Elements::TableRow
       end
 
       it "should return the first row" do
-        table_element.stub(:[]).with(0).and_return(table_element)
-        watir_table.first_row.should be_instance_of PageObject::Elements::TableRow
+        allow(table_element).to receive(:[]).with(0).and_return(table_element)
+        expect(watir_table.first_row).to be_instance_of PageObject::Elements::TableRow
       end
 
       it "shoudl return the last row" do
-        table_element.stub(:[]).with(-1).and_return(table_element)
-        watir_table.last_row.should be_instance_of PageObject::Elements::TableRow
+        allow(table_element).to receive(:[]).with(-1).and_return(table_element)
+        expect(watir_table.last_row).to be_instance_of PageObject::Elements::TableRow
       end
 
       it "should return the number of rows" do
-        table_element.stub(:wd).and_return(table_element)
-        table_element.should_receive(:find_elements).with(:xpath, ".//child::tr").and_return(table_element)
-        table_element.should_receive(:size).and_return(2)
-        watir_table.rows.should == 2
+        allow(table_element).to receive(:wd).and_return(table_element)
+        expect(table_element).to receive(:find_elements).with(:xpath, ".//child::tr").and_return(table_element)
+        expect(table_element).to receive(:size).and_return(2)
+        expect(watir_table.rows).to eql 2
       end
 
       it "should iterate over the table rows" do
-        watir_table.should_receive(:rows).and_return(2)
+        expect(watir_table).to receive(:rows).and_return(2)
         count = 0
         watir_table.each { |e| count += 1 }
-        count.should == 2
+        expect(count).to eql 2
       end
     end
 
@@ -67,31 +67,31 @@ describe PageObject::Elements::Table do
       let(:selenium_table) { PageObject::Elements::Table.new(table_element, :platform => :selenium_webdriver) }
       
       it "should return a table row when indexed" do
-        table_element.should_receive(:find_elements).with(:xpath, ".//child::tr").and_return(table_element)
-        selenium_table[1].should be_instance_of PageObject::Elements::TableRow
+        expect(table_element).to receive(:find_elements).with(:xpath, ".//child::tr").and_return(table_element)
+        expect(selenium_table[1]).to be_instance_of PageObject::Elements::TableRow
       end
 
       it "should return the first row" do
-        table_element.stub(:[]).with(0).and_return(table_element)
-        selenium_table.first_row.should be_instance_of PageObject::Elements::TableRow
+        allow(table_element).to receive(:[]).with(0).and_return(table_element)
+        expect(selenium_table.first_row).to be_instance_of PageObject::Elements::TableRow
       end
 
       it "shoudl return the last row" do
-        table_element.stub(:[]).with(-1).and_return(table_element)
-        selenium_table.last_row.should be_instance_of PageObject::Elements::TableRow
+        allow(table_element).to receive(:[]).with(-1).and_return(table_element)
+        expect(selenium_table.last_row).to be_instance_of PageObject::Elements::TableRow
       end
 
       it "should return the number of rows" do
-        table_element.should_receive(:find_elements).with(:xpath, ".//child::tr").and_return(table_element)
-        table_element.should_receive(:size).and_return(2)
-        selenium_table.rows.should == 2
+        expect(table_element).to receive(:find_elements).with(:xpath, ".//child::tr").and_return(table_element)
+        expect(table_element).to receive(:size).and_return(2)
+        expect(selenium_table.rows).to eql 2
       end
 
       it "should iterate over the table rows" do
-        selenium_table.should_receive(:rows).and_return(2)
+        allow(selenium_table).to receive(:rows).and_return(2)
         count = 0
         selenium_table.each { |e| count += 1 }
-        count.should == 2
+        expect(count).to eql 2
       end
     end
   end

data/spec/page-object/elements/text_area_spec.rb

@@ -8,14 +8,14 @@ describe PageObject::Elements::TextArea do
     it "should map watir types to same" do
       [:class, :id, :index, :name, :xpath].each do |t|
         identifier = textarea.watir_identifier_for t => 'value'
-        identifier.keys.first.should == t
+        expect(identifier.keys.first).to eql t
       end
     end
 
     it "should map selenium types to same" do
       [:class, :id, :name, :xpath, :index].each do |t|
         key, value = textarea.selenium_identifier_for t => 'value'
-        key.should == t
+        expect(key).to eql t
       end
     end
   end
@@ -23,15 +23,15 @@ describe PageObject::Elements::TextArea do
   describe "interface" do
 
     it "should register with tag_name :textarea" do
-      ::PageObject::Elements.element_class_for(:textarea).should == ::PageObject::Elements::TextArea
+      expect(::PageObject::Elements.element_class_for(:textarea)).to eql ::PageObject::Elements::TextArea
     end
     
     context "for Selenium" do
       it "should set its' value" do
         text_area_element = double('text_area')
         text_area = PageObject::Elements::TextArea.new(text_area_element, :platform => :selenium_webdriver)
-        text_area_element.should_receive(:clear)
-        text_area_element.should_receive(:send_keys).with('Joseph')
+        expect(text_area_element).to receive(:clear)
+        expect(text_area_element).to receive(:send_keys).with('Joseph')
         text_area.value = 'Joseph'
       end
     end

data/spec/page-object/elements/unordered_list_spec.rb

@@ -8,14 +8,14 @@ describe PageObject::Elements::UnorderedList do
     it "should map watir types to same" do
       [:class, :id, :index, :xpath].each do |t|
         identifier = ul.watir_identifier_for t => 'value'
-        identifier.keys.first.should == t
+        expect(identifier.keys.first).to eql t
       end
     end
 
     it "should map selenium types to same" do
       [:class, :id, :index, :name, :xpath].each do |t|
         key, value = ul.selenium_identifier_for t => 'value'
-        key.should == t
+        expect(key).to eql t
       end
     end
   end
@@ -24,71 +24,70 @@ describe PageObject::Elements::UnorderedList do
     let(:ul_element) { double('ul_element') }
 
     it "should register with tag_name :ul" do
-      ::PageObject::Elements.element_class_for(:ul).should == ::PageObject::Elements::UnorderedList
+      expect(::PageObject::Elements.element_class_for(:ul)).to eql ::PageObject::Elements::UnorderedList
     end
 
     context "for watir" do
       it "should return a list item when indexed" do
         ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :watir_webdriver)
-        ul_element.stub(:uls).and_return([ul_element])
-        ul_element.stub(:find_elements).and_return(ul_element)
-        ul_element.stub(:map).and_return([ul_element])
-        ul_element.stub(:parent).and_return(ul_element)
-        ul_element.stub(:element).and_return(ul_element)
-        ul_element.stub(:==).and_return(true)
+        allow(ul_element).to receive(:uls).and_return([ul_element])
+        allow(ul_element).to receive(:find_elements).and_return(ul_element)
+        allow(ul_element).to receive(:map).and_return([ul_element])
+        allow(ul_element).to receive(:parent).and_return(ul_element)
+        allow(ul_element).to receive(:element).and_return(ul_element)
+        allow(ul_element).to receive(:==).and_return(true)
         ul[1]
       end
 
       it "should know how many items it contains" do
         ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :watir_webdriver)
-        ul_element.stub(:uls).and_return([ul_element])
-        ul_element.stub(:find_elements).and_return(ul_element)
-        ul_element.stub(:map).and_return([ul_element])
-        ul_element.stub(:parent).and_return(ul_element)
-        ul_element.stub(:element).and_return(ul_element)
-        ul_element.stub(:==).and_return(true)
-        ul.items.should == 1
+        allow(ul_element).to receive(:uls).and_return([ul_element])
+        allow(ul_element).to receive(:find_elements).and_return(ul_element)
+        allow(ul_element).to receive(:map).and_return([ul_element])
+        allow(ul_element).to receive(:parent).and_return(ul_element)
+        allow(ul_element).to receive(:element).and_return(ul_element)
+        allow(ul_element).to receive(:==).and_return(true)
+        expect(ul.items).to eql 1
       end
 
       it "should know how to iterate over the items" do
         ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :watir_webdriver)
-        ul.should_receive(:items).and_return(5)
-        ul.stub(:[])
+        expect(ul).to receive(:items).and_return(5)
+        allow(ul).to receive(:[])
         count = 0
         ul.each { |item| count += 1 }
-        count.should == 5
+        expect(count).to eql 5
       end
     end
 
     context "for selenium" do
       it "should return a list item when indexed" do
         ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :selenium_webdriver)
-        ul_element.should_receive(:find_elements).and_return(ul_element)
-        ul_element.should_receive(:map).and_return([ul_element])
-        ul_element.should_receive(:parent).and_return(ul_element)
-        ul_element.should_receive(:element).and_return(ul_element)
-        ul_element.should_receive(:==).and_return(true)
+        expect(ul_element).to receive(:find_elements).and_return(ul_element)
+        expect(ul_element).to receive(:map).and_return([ul_element])
+        expect(ul_element).to receive(:parent).and_return(ul_element)
+        expect(ul_element).to receive(:element).and_return(ul_element)
+        expect(ul_element).to receive(:==).and_return(true)
         ul[1]
       end
 
       it "should know how many items it contains" do
         ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :selenium_webdriver)
-        ul_element.should_receive(:find_elements).and_return(ul_element)
-        ul_element.should_receive(:map).and_return([ul_element])
-        ul_element.should_receive(:parent).and_return(ul_element)
-        ul_element.should_receive(:element).and_return(ul_element)
-        ul_element.should_receive(:==).and_return(true)
-        ul.items.should == 1
+        expect(ul_element).to receive(:find_elements).and_return(ul_element)
+        expect(ul_element).to receive(:map).and_return([ul_element])
+        expect(ul_element).to receive(:parent).and_return(ul_element)
+        expect(ul_element).to receive(:element).and_return(ul_element)
+        expect(ul_element).to receive(:==).and_return(true)
+        expect(ul.items).to eql 1
       end
 
       it "should know how to iterate over the items" do
         ul = PageObject::Elements::UnorderedList.new(ul_element, :platform => :selenium_webdriver)
-        ul.should_receive(:items).and_return(5)
-        ul.stub(:[])
+        expect(ul).to receive(:items).and_return(5)
+        allow(ul).to receive(:[])
         count = 0
         ul.each { |item| count += 1 }
-        count.should == 5
-
+        expect(count).to eql 5
       end
     end
   end

data/spec/page-object/elements/watir_element_spec.rb

@@ -6,137 +6,136 @@ describe "Element for Watir" do
   let(:watir_element) { ::PageObject::Elements::Element.new(watir_driver, :platform => :watir_webdriver) }
 
   before(:each) do
-    Selenium::WebDriver::Mouse.stub(:new).and_return(watir_driver)
+    allow(Selenium::WebDriver::Mouse).to receive(:new).and_return(watir_driver)
   end
 
   it "should know when it is visible" do
-    watir_driver.stub(:present?).and_return(true)
-    watir_driver.stub(:displayed?).and_return(true)
-    watir_element.visible?.should == true
+    allow(watir_driver).to receive(:present?).and_return(true)
+    allow(watir_driver).to receive(:displayed?).and_return(true)
+    expect(watir_element.visible?).to eql true
   end
 
   it "should know when it is not visible" do
-    watir_driver.stub(:present?).and_return(false)
-    watir_driver.stub(:displayed?).and_return(false)
-    watir_element.visible?.should == false
+    allow(watir_driver).to receive(:present?).and_return(false)
+    allow(watir_driver).to receive(:displayed?).and_return(false)
+    expect(watir_element.visible?).to eql false
   end
 
   it "should know when it exists" do
-    watir_driver.stub(:exists?).and_return(true)
-    watir_element.exists?.should == true
+    allow(watir_driver).to receive(:exists?).and_return(true)
+    expect(watir_element.exists?).to eql true
   end
 
   it "should know when it does not exist" do
-    watir_driver.stub(:exists?).and_return(false)
-    watir_driver.stub(:nil?).and_return(true)
-    watir_element.exists?.should == false
+    allow(watir_driver).to receive(:exists?).and_return(false)
+    allow(watir_driver).to receive(:nil?).and_return(true)
+    expect(watir_element.exists?).to eql false
   end
 
   it "should be able to return the text contained in the element" do
-    watir_driver.should_receive(:text).and_return("my text")
-    watir_element.text.should == "my text"
+    expect(watir_driver).to receive(:text).and_return("my text")
+    expect(watir_element.text).to eql "my text"
   end
 
   it "should know when it is equal to another" do
-    watir_driver.should_receive(:==).and_return(true)
-    watir_element.should == watir_element
+    expect(watir_driver).to receive(:==).and_return(true)
+    expect(watir_element).to eq watir_element
   end
 
   it "should return its tag name" do
-    watir_driver.should_receive(:tag_name).and_return("h1")
-    watir_element.tag_name.should == "h1"
+    expect(watir_driver).to receive(:tag_name).and_return("h1")
+    expect(watir_element.tag_name).to eql "h1"
   end
 
   it "should know its value" do
-    watir_driver.stub(:value).and_return("value")
-    watir_driver.stub(:attribute).and_return("value")
-    watir_element.value.should == "value"
+    allow(watir_driver).to receive(:value).and_return("value")
+    allow(watir_driver).to receive(:attribute).and_return("value")
+    expect(watir_element.value).to eql "value"
   end
 
   it "should know how to retrieve the value of an attribute" do
-    watir_driver.stub(:attribute_value).and_return(true)
-    watir_driver.stub(:attribute).and_return(true)
-    watir_element.attribute("readonly").should be true
+    allow(watir_driver).to receive(:attribute_value).and_return(true)
+    allow(watir_driver).to receive(:attribute).and_return(true)
+    expect(watir_element.attribute("readonly")).to be true
   end
 
   it "should be clickable" do
-    watir_driver.should_receive(:click)
+    expect(watir_driver).to receive(:click)
     watir_element.click
   end
   
   it "should be double clickable" do
-    
-    watir_driver.should_receive(:double_click)
+    expect(watir_driver).to receive(:double_click)
     watir_element.double_click
   end
   
   it "should be right clickable" do
-    watir_driver.stub(:right_click)
-    watir_driver.stub(:context_click)
+    allow(watir_driver).to receive(:right_click)
+    allow(watir_driver).to receive(:context_click)
     watir_element.right_click
   end
 
   it "should be able to block until it is present" do
-    watir_driver.stub(:wait_until_present).with(10)
+    allow(watir_driver).to receive(:wait_until_present).with(10)
     watir_element.when_present(10)
   end
   
   it "should return the element when it is present" do
-    watir_driver.stub(:wait_until_present).with(10)
+    allow(watir_driver).to receive(:wait_until_present).with(10)
     element = watir_element.when_present(10)
-    element.should === watir_element
+    expect(element).to equal watir_element
   end
 
   it "should use the overriden wait when set" do
     PageObject.default_element_wait = 20
-    watir_driver.stub(:wait_until_present).with(20)
+    allow(watir_driver).to receive(:wait_until_present).with(20)
     watir_element.when_present
   end
 
   it "should be able to block until it is visible" do
-    ::Watir::Wait.stub(:until).with(10, "Element was not visible in 10 seconds")
-    watir_driver.stub(:displayed?).and_return(true)
+    allow(::Watir::Wait).to receive(:until).with(10, "Element was not visible in 10 seconds")
+    allow(watir_driver).to receive(:displayed?).and_return(true)
     watir_element.when_visible(10)
   end
   
   it "should return the element when it is visible" do
-    ::Watir::Wait.stub(:until).with(10, "Element was not visible in 10 seconds")
-    watir_driver.stub(:displayed?).and_return(true)
+    allow(::Watir::Wait).to receive(:until).with(10, "Element was not visible in 10 seconds")
+    allow(watir_driver).to receive(:displayed?).and_return(true)
     element = watir_element.when_visible(10)
-    element.should === watir_element
+    expect(element).to equal watir_element
   end
 
   it "should be able to block until it is not visible" do
-    ::Watir::Wait.stub(:while).with(10, "Element still visible after 10 seconds")
-    watir_driver.stub(:displayed?).and_return(false)
+    allow(::Watir::Wait).to receive(:while).with(10, "Element still visible after 10 seconds")
+    allow(watir_driver).to receive(:displayed?).and_return(false)
     watir_element.when_not_visible(10)
   end
   
   it "should return the element when it is not visible" do
-    ::Watir::Wait.stub(:while).with(10, "Element still visible after 10 seconds")
-    watir_driver.stub(:displayed?).and_return(false)
+    allow(::Watir::Wait).to receive(:while).with(10, "Element still visible after 10 seconds")
+    allow(watir_driver).to receive(:displayed?).and_return(false)
     element = watir_element.when_not_visible(10)
-    element.should === watir_element
+    expect(element).to equal watir_element
   end
 
   it "should be able to block until a user define event fires true" do
-    ::Watir::Wait.stub(:until).with(10, "Element blah")
+    allow(::Watir::Wait).to receive(:until).with(10, "Element blah")
     watir_element.wait_until(10, "Element blah") {true}
   end
   
   it "should send keys to the element" do
-    watir_driver.should_receive(:send_keys).with([:control, 'a'])
+    expect(watir_driver).to receive(:send_keys).with([:control, 'a'])
     watir_element.send_keys([:control, 'a'])
   end
   
   it "should clear its' contents" do
-    watir_driver.should_receive(:clear)
+    expect(watir_driver).to receive(:clear)
     watir_element.clear
   end
 
   it "should scroll into view" do
-    watir_driver.stub(:wd).and_return(watir_driver)
-    watir_driver.should_receive(:location_once_scrolled_into_view)
+    allow(watir_driver).to receive(:wd).and_return(watir_driver)
+    expect(watir_driver).to receive(:location_once_scrolled_into_view)
     watir_element.scroll_into_view
   end
 end