symbiont 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae39ecb1d2f038bed55793424d0eb7d00cf5fa44
-  data.tar.gz: 97e1fe74cc798c76e1eee44c75d008e3fd3498be
+  metadata.gz: 5a17be88a1a66fd53974eee6f17a008c0dc13578
+  data.tar.gz: bccc7ebb6507f1fd54314215db12ecd623e0f035
 SHA512:
-  metadata.gz: a30e010e67f0afb4dbc9a2db2fb089e136d5cab838cb663306372ef7415c767f57e35cf81b637eeb76235d92724f403a793f5b4e67a622e21466d0af01a6769e
-  data.tar.gz: 1f9f7c9c31b0b8e84e1c102e636504e162d05fa9d02eef9cf7d1b044411bbee0f413ba8f3fb3354fcb3a50e05d807e504b03a5858d00e242e9a4a77da11efd0c
+  metadata.gz: d411934cd0073c31ce602b7af9c4b4d4f1025dbac7e69f8279ebc2ed0b965c845186ac523a5c13b6a1b1941eb2f317d80efb705b17728b9343fd756383ab0702
+  data.tar.gz: b00c7ca11d7ba5d2445324279439734f9dc4d808ef54b3592dde4547b38da55c07cf0149c298c34afa7e334932435342ee56c2bec536760a440c5ade01252caa

data/lib/symbiont/accessor.rb

@@ -3,7 +3,7 @@ module Symbiont
     # @param element [Symbol] name of Watir-based object
     # @param locator [Hash] locators for referencing the element
     def reference_element(element, locator)
-      driver.send(element, locator)
+      browser.send(element, locator)
     end
   end
 end

data/lib/symbiont/assertions.rb

@@ -17,7 +17,7 @@ module Symbiont
       title_is_empty if title.nil? or title.empty?
       @title = title
     end
-    
+
     def asserted_url
       @url
     end

data/lib/symbiont/factory.rb

@@ -18,7 +18,7 @@ module Symbiont
         return @context
       end
 
-      @page = definition.new(@driver)
+      @page = definition.new(@browser)
       @page.view if visit == true
 
       @page.has_correct_url? if @page.respond_to?(:url_matches)

data/lib/symbiont/helpers.rb

@@ -1,5 +1,8 @@
 module Symbiont
   module Helpers
+
+    private
+
     def url_is_empty
       puts "\nERROR".on_red
       puts "The url_is assertion is empty on the definition #{retrieve_class(caller)}.".cyan
@@ -36,8 +39,6 @@ module Symbiont
       raise Symbiont::Errors::NoTitleForDefinition
     end
 
-    private
-
     def retrieve_class(caller)
       caller[1][/`.*'/][8..-3]
     end

data/lib/symbiont/pages.rb

@@ -4,18 +4,18 @@ module Symbiont
 
     def view
       no_url_is_provided if asserted_url.nil?
-      driver.goto(asserted_url)
+      browser.goto(asserted_url)
       self
     end
 
     def has_correct_url?
       no_url_matches_is_provided if url_match.nil?
-      !(driver.url =~ url_match).nil?
+      !(browser.url =~ url_match).nil?
     end
 
     def has_correct_title?
       no_title_is_provided if asserted_title.nil?
-      !(driver.title.match(asserted_title)).nil?
+      !(browser.title.match(asserted_title)).nil?
     end
 
     def verified?
@@ -36,35 +36,35 @@ module Symbiont
     end
 
     def url
-      driver.url
+      browser.url
     end
 
     def markup
-      driver.html
+      browser.html
     end
 
     def text
-      driver.text
+      browser.text
     end
 
     def title
-      driver.title
+      browser.title
     end
 
     def visit(url)
-      driver.goto(url)
+      browser.goto(url)
     end
 
     def screenshot(file)
-      driver.wd.save_screenshot(file)
+      browser.wd.save_screenshot(file)
     end
 
     def run_script(script, *args)
-      driver.execute_script(script, *args)
+      browser.execute_script(script, *args)
     end
 
     def get_cookie(name)
-      for cookie in driver.cookies.to_a
+      for cookie in browser.cookies.to_a
         if cookie[:name] == name
           return cookie[:value]
         end
@@ -73,11 +73,11 @@ module Symbiont
     end
 
     def clear_cookies
-      driver.cookies.clear
+      browser.cookies.clear
     end
 
     def refresh
-      driver.refresh
+      browser.refresh
     end
 
     # @param block [Proc] the code that generates the alert
@@ -85,9 +85,9 @@ module Symbiont
     def will_alert(&block)
       yield
       value = nil
-      if driver.alert.exists?
-        value = driver.alert.text
-        driver.alert.ok
+      if browser.alert.exists?
+        value = browser.alert.text
+        browser.alert.ok
       end
       value
     end
@@ -98,9 +98,9 @@ module Symbiont
     def will_confirm(response, &block)
       yield
       value = nil
-      if driver.alert.exists?
-        value = driver.alert.text
-        response ? driver.alert.ok : driver.alert.close
+      if browser.alert.exists?
+        value = browser.alert.text
+        response ? browser.alert.ok : browser.alert.close
       end
       value
     end
@@ -111,9 +111,9 @@ module Symbiont
     # the value that the prompt had before the response was applied
     def will_prompt(response, &block)
       cmd = "window.prompt = function(text, value) {window.__lastWatirPrompt = {message: text, default_value: value}; return '#{response}';}"
-      driver.wd.execute_script(cmd)
+      browser.wd.execute_script(cmd)
       yield
-      result = driver.wd.execute_script('return window.__lastWatirPrompt')
+      result = browser.wd.execute_script('return window.__lastWatirPrompt')
       result && result.dup.each_key { |k| result[k.to_sym] = result.delete(k) }
       result
     end

data/lib/symbiont/version.rb

@@ -1,3 +1,3 @@
 module Symbiont
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/symbiont.rb

@@ -43,12 +43,12 @@ module Symbiont
   end
 
   # @return [Object] browser driver reference
-  attr_reader :driver
+  attr_reader :browser
 
   # @param driver [Object] a tool driver instance
   def initialize(driver)
-    Symbiont.trace("Symbiont attached to driver:\n\t#{driver.inspect}")
-    @driver = driver
+    Symbiont.trace("Symbiont attached to browser:\n\t#{driver.inspect}")
+    @browser = driver
 
     initialize_page if respond_to?(:initialize_page)
     initialize_activity if respond_to?(:initialize_activity)
@@ -60,7 +60,7 @@ def attach(mod=Symbiont)
 end
 
 def symbiont_browser(browser=:firefox)
-  @driver = Watir::Browser.new browser
+  @browser = Watir::Browser.new browser
 end
 
 alias :symbiont_browser_for :symbiont_browser
@@ -83,3 +83,8 @@ class Watir::CheckBox
   alias_method :uncheck, :clear
   alias_method :checked?, :set?
 end
+
+class Watir::Radio
+  alias_method :choose, :set
+  alias_method :chosen?, :set?
+end

data/spec/fixtures/page_definitions.rb

@@ -4,7 +4,7 @@ end
 
 class TestFactory
   include Symbiont::Factory
-  attr_accessor :driver
+  attr_accessor :browser
   attr_accessor :page
 end
 
@@ -22,15 +22,15 @@ class ValidPage
   %w(text_field button file_field textarea select_list checkbox).each do |element|
     send element, :"#{element}", id: element
 
-    send element, :"#{element}_proc", proc { driver.send(element, id: element) }
-    send element, :"#{element}_lambda", -> { driver.send(element, id: element) }
+    send element, :"#{element}_proc", proc { browser.send(element, id: element) }
+    send element, :"#{element}_lambda", -> { browser.send(element, id: element) }
 
     send element, :"#{element}_block" do
-      driver.send(element, id: element)
+      browser.send(element, id: element)
     end
 
     send element, :"#{element}_block_arg" do |id|
-      driver.send(element, id: id)
+      browser.send(element, id: id)
     end
   end
 end

data/spec/symbiont/factory_spec.rb

@@ -3,51 +3,51 @@ require 'spec_helper'
 describe Symbiont::Factory do
   before(:each) do
     @factory = TestFactory.new
-    @factory.driver = mock_browser_for_watir
+    @factory.browser = mock_browser_for_watir
   end
 
   it 'will create a new definition and view it, using on_view' do
-    expect(@factory.driver).to receive(:goto)
+    expect(@factory.browser).to receive(:goto)
     @factory.on_view(ValidPage)
   end
 
   it 'will create a new definition and view it, using on_view and a block' do
-    expect(@factory.driver).to receive(:goto)
+    expect(@factory.browser).to receive(:goto)
     @factory.on_view ValidPage do |page|
       expect(page).to be_instance_of ValidPage
     end
   end
 
   it 'will create a new definition, using on and a block with a parameter' do
-    expect(@factory.driver).not_to receive(:goto)
+    expect(@factory.browser).not_to receive(:goto)
     @factory.on ValidPage do |page|
       expect(page).to be_instance_of ValidPage
     end
   end
 
   it 'will create a new definition, using on and a block without a parameter' do
-    expect(@factory.driver).not_to receive(:goto)
+    expect(@factory.browser).not_to receive(:goto)
     @factory.on ValidPage do
       expect(@factory.page).to be_instance_of ValidPage
     end
   end
 
   it 'will use an existing object reference with on' do
-    expect(@factory.driver).to receive(:goto)
+    expect(@factory.browser).to receive(:goto)
     obj1 = @factory.on_view ValidPage
     obj2 = @factory.on ValidPage
     expect(obj1).to be(obj2)
   end
 
   it 'will not use an existing object reference with on_new' do
-    expect(@factory.driver).to receive(:goto)
+    expect(@factory.browser).to receive(:goto)
     obj1 = @factory.on_view ValidPage
     obj2 = @factory.on_new ValidPage
     expect(obj1).not_to be(obj2)
   end
 
   it 'will create a new definition, using on_set' do
-    expect(@factory.driver).not_to receive(:goto)
+    expect(@factory.browser).not_to receive(:goto)
     @factory.on_set ValidPage do |page|
       expect(page).to be_instance_of ValidPage
     end
@@ -60,7 +60,7 @@ describe Symbiont::Factory do
   end
 
   it 'will use an existing object reference with on_set' do
-    expect(@factory.driver).to receive(:goto)
+    expect(@factory.browser).to receive(:goto)
     obj1 = @factory.on_view ValidPage
     obj2 = @factory.on_set ValidPage
     expect(obj1).to be(obj2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symbiont
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jeff Nyman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +134,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: "\n(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n
-  \ Symbiont 0.6.0 has been installed.\n\n(::) (::) (::) (::) (::) (::) (::) (::)
+  \ Symbiont 0.7.0 has been installed.\n\n(::) (::) (::) (::) (::) (::) (::) (::)
   (::) (::) (::) (::)\n  "
 rdoc_options: []
 require_paths: