rufus 0.8.1 → 0.8.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjM1NDY1NDI2OGJiODkwMThiY2E5ZmQ5MTFkZjliMTZmYjQwNzk3Zg==
+    OTYwYWRhNzY3NTM4NjM1NjQxYzZlYmFiMzk3NTFmMTU4YjIxZjQ0OA==
   data.tar.gz: !binary |-
-    NTJjM2ZjMThjNjAxODIyNmU4MDIyNjI3MDI3OGUzMjQ0OGQ5M2M5Mg==
+    ZjA0N2FhYmYyZmNlZGU4NDNhODczYjlkNGEyOGE3Y2E0MjkzYjYyZA==
 SHA512:
   metadata.gz: !binary |-
-    YzljZjRjMzE5N2Y3NTI0NDMwMGVhNzU3YjA1Mjc4NjE0NzNiMjkzYzE2MTM2
-    MTBjNDMzM2EzNmE3OTE4OTU1M2IwYjZmMjU2YzI0ZmMxYWQ4ZjBjNGZkZmUx
-    MGFlZWFkOTAxNTVhZjEwOTEyMDcxYWNmNjIzMjBjMjBlNzFmNmM=
+    MjIzN2IyYmI2NWFlYzc3NTI4NzA4ZjAzYjA4ZTExMGFmMDcwMWJiOTNhYWE1
+    YjI2Y2ExYTlhZTE0ZGMzY2VjMTJjMWU5MTc3NjgzNjEzNDI4NTUzZGIwM2Uw
+    MGRmYTBhMTMwYzM0Njg1OGI2MzJiNzdkYzVhMmFmMWQ3ZTJiZTg=
   data.tar.gz: !binary |-
-    ZWRlYjExNzgzNGRmOTkwMTQzYjAzM2Y4OGFjZWVkM2JmYWRjMzZkZWU4YTUy
-    N2U1YjI1NmJlNDAyZjdlMGMwMTBlYzk5MjEwODkxMWE4ZjkwZDMxNmRlOTQ5
-    MzM0NDJhNDVmYzFjYTg5ZWY3ZDVjZjQxYTY2YzIwZTEyYjBjYjM=
+    NDY3MzYxNGEyMDhjZTgwYmU5ZjdjYjk4NTAzMzc3Mzk1MzMyMmQ3MmM4ODkw
+    MDBhMjRlMmE1ZWQwMDEyM2U1Nzg0M2Y3NTExMTRjYzc4YzJmNDk3ZTMyMjcz
+    ODUzOGE4NTAwNzNhMTFhYzE2OWQ0OGIyOTFjYmY1MzA1YjUwMGM=

data/README.md

@@ -1,4 +1,4 @@
-Last Updated: 12-10-2013
+Last Updated: 12-12-2013
 
 This project is intended to facilitate automated testing on iOS devices using cucumber, appium and the Page Object pattern. 
 
@@ -29,8 +29,14 @@ QUICK START GUIDE
 ------------------------------
 - gem install rufus
 - require 'rufus' in your Gemfile
-- Create a config.yml in project directory (the one with .xcodeproj in it) with the following information:
+- In your env.rb, new up a rufus driver in a method that MUST be named selenium.
 
+````ruby
+    def selenium
+       @driver ||= new Rufus::Driver.new
+    end
+````
+- Create a config.yml in project directory (the one with .xcodeproj in it) with the following information:
 
 ````YAML
     browser: iOS

data/lib/rufus.rb

@@ -2,6 +2,7 @@ require 'rufus/navigation'
 require 'rufus/accessors/accessors'
 require 'rufus/accessors/view'
 require 'rufus/accessors/table'
+require 'rufus/waiter'
 
 module Rufus
 
@@ -10,38 +11,23 @@ module Rufus
   end
 
   def exists_after_wait?(view, timeout = 5)
-    wait = Selenium::WebDriver::Wait.new :timeout => timeout
-    begin
-      wait.until{view.exists?}
-    rescue Selenium::WebDriver::Error::TimeOutError
-      return false
-    end
-    true
+    wait = Rufus::Waiter.new selenium, :timeout => timeout
+    wait.until{view.exists?}
   end
 
   def displayed_after_wait?(view, timeout = 5)
-    wait = Selenium::WebDriver::Wait.new :timeout => timeout
-    begin
-      wait.until{view.displayed?}
-    rescue Selenium::WebDriver::Error::TimeOutError
-      return false
-    end
-    true
+    wait = Rufus::Waiter.new selenium, :timeout => timeout
+    wait.until{view.displayed?}
   end
 
   def enabled_after_wait?(view, timeout = 5)
-    wait = Selenium::WebDriver::Wait.new :timeout => timeout
-    begin
-      wait.until{view.enabled?}
-    rescue Selenium::WebDriver::Error::TimeOutError
-      return false
-    end
-    true
+    wait = Rufus::Waiter.new selenium, :timeout => timeout
+    wait.until{view.enabled?}
   end
 
   def enabled_hash_after_wait?(locator, timeout = 5)
-    element = find locator
-    enabled_after_wait? element, timeout
+    view = Rufus::Accessors::View.new locator
+    enabled_after_wait? view, timeout
   end
 
   def exists_hash_after_wait?(locator, timeout = 5)

data/lib/rufus/driver.rb

@@ -131,6 +131,10 @@ module Rufus
       driver.screenshot name
     end
 
+    def reset_page_source
+      driver.reset_page_source
+    end
+
     def driver
       @selenium_driver ||= Rufus::Drivers::DriverFactory.driver_for(@config)
     end

data/lib/rufus/drivers/driver_base.rb

@@ -160,7 +160,12 @@ module Rufus
       end
 
       def page_source
-        selenium.page_source
+        @page_source = selenium.page_source if @page_source.nil?
+        @page_source
+      end
+
+      def reset_page_source
+        @page_source = nil
       end
 
       def all_elements

data/lib/rufus/navigation.rb

@@ -5,6 +5,7 @@ module Rufus
     include PageNavigation
 
     def on(cls, timeout = 10, &block)
+      selenium.reset_page_source
       screen = cls.new
       wait = 0
       until wait == timeout  do

data/lib/rufus/waiter.rb

@@ -0,0 +1,25 @@
+module Rufus
+  class Waiter
+
+    DEFAULT_TIMEOUT = 5
+    DEFAULT_INTERVAL = 0.2
+
+
+    def initialize(selenium, opts={})
+      @selenium = selenium
+      @timeout  = opts.fetch(:timeout, DEFAULT_TIMEOUT)
+      @interval = opts.fetch(:interval, DEFAULT_INTERVAL)
+    end
+
+    def until(&block)
+      time = Time.now + @timeout
+      while Time.now < time
+        @selenium.reset_page_source
+        value = block.call if block
+        return value if value
+        sleep @interval
+      end
+      false
+    end
+  end
+end

data/rufus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "rufus"
-  gem.version       = "0.8.1"
+  gem.version       = "0.8.2"
   gem.authors       = ["Jeremy Stewart"]
   gem.email         = ["jlstewart379@gmail.com"]
   gem.description   = "Page object wrapper for Appium"

data/spec/drivers_specs/waiter_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'rufus/waiter'
+
+describe Rufus::Waiter do
+
+  let(:view){'mock view'}
+  let(:driver){'mock selenium driver'}
+
+  before(:each) do
+    @waiter = Rufus::Waiter.new driver, :timeout => 0.1, :interval => 0.1
+    driver.should_receive(:reset_page_source)
+  end
+
+  it 'returns false if the block is not true' do
+    view.should_receive(:exists?).and_return(false)
+    @waiter.until{view.exists?}.should be_false
+  end
+
+  it 'returns true if the block is true' do
+    view.should_receive(:exists?).and_return(true)
+    @waiter.until{view.exists?}.should be_true
+  end
+end

data/spec/navigation_spec.rb

@@ -13,7 +13,10 @@ describe Rufus::Navigation do
 
   context 'getting the active screen' do
 
+    let(:selenium){double('mock selenium driver')}
+
     before (:each) do
+      selenium.should_receive(:reset_page_source)
       mock_page.should_receive(:new).and_return(mock_page)
     end
 

data/spec/rufus_spec.rb

@@ -7,81 +7,53 @@ require 'yaml'
 describe Rufus do
   include Rufus
 
-  context 'waiting for an element to exist' do
+  let(:mock_wait){'mock Rufus::Waiter'}
+  let(:mock_view){'a mock view object'}
+  let(:selenium){double('Selenium::WebDriver')}
 
-    let(:mock_wait){'mock Selenium::WebDriver::Wait'}
-    let(:mock_view){'a mock view object'}
 
+  context 'waiting for an element to exist' do
     context 'element exists with timeout given' do
       it 'returns true if an element is found before given timeout occurs' do
-        Selenium::WebDriver::Wait.should_receive(:new).with(:timeout => 20).and_return(mock_wait)
-        mock_wait.should_receive(:until)
-        exists_after_wait?(mock_view, 20).should be_true
+        Rufus::Waiter.should_receive(:new).with(selenium, :timeout => 1).and_return(mock_wait)
+        mock_wait.should_receive(:until).and_return(true)
+        exists_after_wait?(mock_view, 1).should be_true
       end
       it 'returns true if an element is found before default timeout occurs' do
-        Selenium::WebDriver::Wait.should_receive(:new).with(:timeout => 5).and_return(mock_wait)
-        mock_wait.should_receive(:until)
+        Rufus::Waiter.should_receive(:new).with(selenium, :timeout => 5).and_return(mock_wait)
+        mock_wait.should_receive(:until).and_return(true)
         exists_after_wait?(mock_view).should be_true
       end
     end
-    context 'element does not exist' do
-      it 'returns false if the timeout is reached' do
-        Selenium::WebDriver::Wait.should_receive(:new).with(:timeout => 5).and_return(mock_wait)
-        mock_wait.should_receive(:until).and_raise(Selenium::WebDriver::Error::TimeOutError)
-        exists_after_wait?(mock_view).should be_false
-      end
-    end
   end
 
   context 'waiting for an element to be displayed' do
-
-    let(:mock_wait){'mock Selenium::WebDriver::Wait'}
-    let(:mock_view){'a mock view object'}
-
     context 'element is displayed with timeout given' do
-      it 'returns true if an element is displayed before given timeout occurs' do
-        Selenium::WebDriver::Wait.should_receive(:new).with(:timeout => 20).and_return(mock_wait)
-        mock_wait.should_receive(:until)
-        displayed_after_wait?(mock_view, 20).should be_true
-      end
-      it 'returns true if an element is displayed before default timeout occurs' do
-        Selenium::WebDriver::Wait.should_receive(:new).with(:timeout => 5).and_return(mock_wait)
-        mock_wait.should_receive(:until)
-        displayed_after_wait?(mock_view).should be_true
+        it 'returns true if an element is displayed before given timeout occurs' do
+          Rufus::Waiter.should_receive(:new).with(selenium, :timeout => 1).and_return(mock_wait)
+          mock_wait.should_receive(:until).and_return(true)
+          displayed_after_wait?(mock_view, 1).should be_true
+        end
+        it 'returns true if an element is displayed before default timeout occurs' do
+          Rufus::Waiter.should_receive(:new).with(selenium, :timeout => 5).and_return(mock_wait)
+          mock_wait.should_receive(:until).and_return(true)
+          displayed_after_wait?(mock_view).should be_true
+        end
       end
     end
-    context 'element does not exist' do
-      it 'returns false if the timeout is reached' do
-        Selenium::WebDriver::Wait.should_receive(:new).with(:timeout => 5).and_return(mock_wait)
-        mock_wait.should_receive(:until).and_raise(Selenium::WebDriver::Error::TimeOutError)
-        displayed_after_wait?(mock_view).should be_false
-      end
-    end
-  end
   context 'waiting for an element to be enabled' do
-
-    let(:mock_wait){'mock Selenium::WebDriver::Wait'}
-    let(:mock_view){'a mock view object'}
-
     context 'element is enabled with timeout given' do
-      it 'returns true if an element is displayed before given timeout occurs' do
-        Selenium::WebDriver::Wait.should_receive(:new).with(:timeout => 20).and_return(mock_wait)
-        mock_wait.should_receive(:until)
-        enabled_after_wait?(mock_view, 20).should be_true
+      it 'returns true if an element is enabled before given timeout occurs' do
+        Rufus::Waiter.should_receive(:new).with(selenium, :timeout => 1).and_return(mock_wait)
+        mock_wait.should_receive(:until).and_return(true)
+        enabled_after_wait?(mock_view, 1).should be_true
       end
-      it 'returns true if an element is enabled before default timeout occurs' do
-        Selenium::WebDriver::Wait.should_receive(:new).with(:timeout => 5).and_return(mock_wait)
-        mock_wait.should_receive(:until)
+      it 'returns true if an element is not enabled before default timeout occurs' do
+        Rufus::Waiter.should_receive(:new).with(selenium, :timeout => 5).and_return(mock_wait)
+        mock_wait.should_receive(:until).and_return(true)
         enabled_after_wait?(mock_view).should be_true
       end
     end
-    context 'element does not exist' do
-      it 'returns false if the timeout is reached' do
-        Selenium::WebDriver::Wait.should_receive(:new).with(:timeout => 5).and_return(mock_wait)
-        mock_wait.should_receive(:until).and_raise(Selenium::WebDriver::Error::TimeOutError)
-        enabled_after_wait?(mock_view).should be_false
-      end
-    end
   end
 
   context 'elements without accessors' do
@@ -113,4 +85,51 @@ describe Rufus do
       scroll_to(:name => 'elementName')
     end
   end
+  context 'using locators to find elements not defined with accessors' do
+
+    let(:test_locator){{:name => 'someViewName'}}
+
+    context 'determine if element is enabled' do
+      before(:each) do
+        Rufus::Waiter.should_receive(:new).with(selenium, :timeout => 5).and_return(mock_wait)
+        Rufus::Accessors::View.should_receive(:new).with(test_locator).and_return(mock_view)
+      end
+      it 'can determine if an element is enabled' do
+        mock_wait.should_receive(:until).and_return(true)
+        enabled_hash_after_wait?(test_locator).should be_true
+      end
+      it 'can determine if an element is not enabled' do
+        mock_wait.should_receive(:until).and_return(false)
+        enabled_hash_after_wait?(test_locator).should be_false
+      end
+    end
+    context 'determine if element is displayed' do
+      before(:each) do
+        Rufus::Waiter.should_receive(:new).with(selenium, :timeout => 5).and_return(mock_wait)
+        Rufus::Accessors::View.should_receive(:new).with(test_locator).and_return(mock_view)
+      end
+      it 'can determine if an element is enabled' do
+        mock_wait.should_receive(:until).and_return(true)
+        displayed_hash_after_wait?(test_locator).should be_true
+      end
+      it 'can determine if an element is not enabled' do
+        mock_wait.should_receive(:until).and_return(false)
+        displayed_hash_after_wait?(test_locator).should be_false
+      end
+    end
+    context 'determine if element exists by hash' do
+      before(:each) do
+        Rufus::Waiter.should_receive(:new).with(selenium, :timeout => 5).and_return(mock_wait)
+        Rufus::Accessors::View.should_receive(:new).with(test_locator).and_return(mock_view)
+      end
+      it 'can determine if an element is enabled' do
+        mock_wait.should_receive(:until).and_return(true)
+        exists_hash_after_wait?(test_locator).should be_true
+      end
+      it 'can determine if an element is not enabled' do
+        mock_wait.should_receive(:until).and_return(false)
+        exists_hash_after_wait?(test_locator).should be_false
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufus
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Jeremy Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: page_navigation
@@ -361,6 +361,7 @@ files:
 - lib/rufus/drivers/iOS_simulator.rb
 - lib/rufus/navigation.rb
 - lib/rufus/parser.rb
+- lib/rufus/waiter.rb
 - rakefile
 - rufus.gemspec
 - spec/accessors_spec.rb
@@ -370,6 +371,7 @@ files:
 - spec/drivers_specs/iOS_faster_device_spec.rb
 - spec/drivers_specs/iOS_faster_simulator_spec.rb
 - spec/drivers_specs/iOS_simulator_spec.rb
+- spec/drivers_specs/waiter_spec.rb
 - spec/navigation_spec.rb
 - spec/parser_spec.rb
 - spec/rufus_spec.rb