symbiont 0.11.0 → 0.12.0

data/lib/symbiont/pages.rb

@@ -1,164 +1,161 @@
-module Symbiont
-  module Page
-    include Helpers
-
-    def view
-      no_url_is_provided if asserted_url.nil?
-      browser.goto(asserted_url)
-      self
-    end
-
-    def has_correct_url?
-      no_url_matches_is_provided if url_match.nil?
-      !(browser.url =~ url_match).nil?
-    end
-
-    def has_correct_title?
-      no_title_is_provided if asserted_title.nil?
-      !(browser.title.match(asserted_title)).nil?
-    end
-
-    def verified?
-      has_correct_url?
-      has_correct_title?
-    end
-
-    def asserted_url
-      self.class.asserted_url
-    end
-
-    def url_match
-      self.class.url_match
-    end
-
-    def asserted_title
-      self.class.asserted_title
-    end
-
-    def url
-      browser.url
-    end
-
-    def markup
-      browser.html
-    end
-
-    def text
-      browser.text
-    end
-
-    def title
-      browser.title
-    end
-
-    def visit(url)
-      browser.goto(url)
-    end
-
-    def screenshot(file)
-      browser.wd.save_screenshot(file)
-    end
-
-    def run_script(script, *args)
-      browser.execute_script(script, *args)
-    end
-
-    def get_cookie(name)
-      for cookie in browser.cookies.to_a
-        if cookie[:name] == name
-          return cookie[:value]
-        end
-      end
-      nil
-    end
-
-    def clear_cookies
-      browser.cookies.clear
-    end
-
-    def refresh
-      browser.refresh
-    end
-
-    # @param block [Proc] the code that generates the alert
-    # @return [String] the message contained in the alert message box
-    def will_alert(&block)
-      yield
-      value = nil
-      if browser.alert.exists?
-        value = browser.alert.text
-        browser.alert.ok
-      end
-      value
-    end
-
-    # @param response [Boolean] true to accept the confirmation, false to cancel it
-    # @param block [Proc] the code that generates the confirmation
-    # @return [String] the message contained in the confirmation message box
-    def will_confirm(response, &block)
-      yield
-      value = nil
-      if browser.alert.exists?
-        value = browser.alert.text
-        response ? browser.alert.ok : browser.alert.close
-      end
-      value
-    end
-
-    # @param response [String] the value to be used in the prompt
-    # @param block [Proc] the code that generates the prompt
-    # @return [Hash] :message for the prompt message, :default_value for
-    # 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}';}"
-      browser.wd.execute_script(cmd)
-      yield
-      result = browser.wd.execute_script('return window.__lastWatirPrompt')
-      result && result.dup.each_key { |k| result[k.to_sym] = result.delete(k) }
-      result
-    end
-
-    # Used to identify a web element or action on a web element as existing
-    # within an enclosing window object. The window can be referenced using
-    # either the title attribute of the window or a direct URL. The URL does
-    # not have to be the entire URL; it can just be a page name.
-    #
-    # @param locator [Hash] the :title or :url of the window
-    # @param block [Proc] any code that should be executed as an
-    # action on or within the window
-    def within_window(locator, &block)
-      identifier = {locator.keys.first => /#{Regexp.escape(locator.values.first)}/}
-      browser.window(identifier).use(&block)
-    end
-
-    # Used to identify a web element as existing within an enclosing object
-    # like a modal dialog box. What this does is override the normal call to
-    # showModalDialog and opens a window instead. In order to use this new
-    # window, you have to attach to it.
-    def within_modal(&block)
-      convert_modal_to_window = %Q{
-        window.showModalDialog = function(sURL, vArguments, sFeatures) {
-          window.dialogArguments = vArguments;
-          modalWin = window.open(sURL, 'modal', sFeatures);
-          return modalWin;
-        }
-      }
-      browser.execute_script(convert_modal_to_window)
-      yield if block_given?
-    end
-
-    alias_method :current_url, :url
-    alias_method :page_url, :url
-    alias_method :html, :markup
-    alias_method :page_text, :text
-    alias_method :page_title, :title
-    alias_method :navigate_to, :visit
-    alias_method :goto, :visit
-    alias_method :save_screenshot, :screenshot
-    alias_method :execute_script, :run_script
-    alias_method :remove_cookies, :clear_cookies
-    alias_method :refresh_page, :refresh
-    alias_method :select_window, :within_window
-    alias_method :attach_to, :within_window
-  end
-end
+module Symbiont
+  module Page
+    include Helpers
+
+    def view
+      no_url_is_provided if asserted_url.nil?
+      browser.goto(asserted_url)
+      self
+    end
+
+    def correct_url?
+      no_url_matches_is_provided if url_match.nil?
+      !(browser.url =~ url_match).nil?
+    end
+
+    def correct_title?
+      no_title_is_provided if asserted_title.nil?
+      !(browser.title.match(asserted_title)).nil?
+    end
+
+    def verified?
+      correct_url?
+      correct_title?
+    end
+
+    def asserted_url
+      self.class.asserted_url
+    end
+
+    def url_match
+      self.class.url_match
+    end
+
+    def asserted_title
+      self.class.asserted_title
+    end
+
+    def url
+      browser.url
+    end
+
+    def markup
+      browser.html
+    end
+
+    def text
+      browser.text
+    end
+
+    def title
+      browser.title
+    end
+
+    def visit(url)
+      browser.goto(url)
+    end
+
+    def screenshot(file)
+      browser.wd.save_screenshot(file)
+    end
+
+    def run_script(script, *args)
+      browser.execute_script(script, *args)
+    end
+
+    def get_cookie(name)
+      browser.cookies.to_a.each do |cookie|
+        return cookie[:value] if cookie[:name] == name
+      end
+      nil
+    end
+
+    def clear_cookies
+      browser.cookies.clear
+    end
+
+    def refresh
+      browser.refresh
+    end
+
+    # @return [String] the message contained in the alert message box
+    def will_alert
+      yield
+      value = nil
+      if browser.alert.exists?
+        value = browser.alert.text
+        browser.alert.ok
+      end
+      value
+    end
+
+    # @param response [Boolean] true to accept confirmation, false to cancel it
+    # @return [String] the message contained in the confirmation message box
+    def will_confirm(response)
+      yield
+      value = nil
+      if browser.alert.exists?
+        value = browser.alert.text
+        response ? browser.alert.ok : browser.alert.close
+      end
+      value
+    end
+
+    # @param response [String] the value to be used in the prompt
+    # @return [Hash] :message for the prompt message, :default_value for
+    # the value that the prompt had before the response was applied
+    def will_prompt(response)
+      cmd = "window.prompt = function(text, value) \
+        {window.__lastWatirPrompt = {message: text, default_value: value}; \
+        return '#{response}';}"
+      browser.wd.execute_script(cmd)
+      yield
+      result = browser.wd.execute_script('return window.__lastWatirPrompt')
+      result && result.dup.each_key { |k| result[k.to_sym] = result.delete(k) }
+      result
+    end
+
+    # Used to identify a web element or action on a web element as existing
+    # within an enclosing window object. The window can be referenced using
+    # either the title attribute of the window or a direct URL. The URL does
+    # not have to be the entire URL; it can just be a page name.
+    #
+    # @param locator [Hash] the :title or :url of the window
+    # @param block [Proc] any code that should be executed as an
+    # action on or within the window
+    def within_window(locator, &block)
+      identifier = { locator.keys.first => /#{Regexp.escape(locator.values.first)}/ }
+      browser.window(identifier).use(&block)
+    end
+
+    # Used to identify a web element as existing within an enclosing object
+    # like a modal dialog box. What this does is override the normal call to
+    # showModalDialog and opens a window instead. In order to use this new
+    # window, you have to attach to it.
+    def within_modal
+      convert_modal_to_window = %{
+        window.showModalDialog = function(sURL, vArguments, sFeatures) {
+          window.dialogArguments = vArguments;
+          modalWin = window.open(sURL, 'modal', sFeatures);
+          return modalWin;
+        }
+      }
+      browser.execute_script(convert_modal_to_window)
+      yield if block_given?
+    end
+
+    alias_method :current_url, :url
+    alias_method :page_url, :url
+    alias_method :html, :markup
+    alias_method :page_text, :text
+    alias_method :page_title, :title
+    alias_method :navigate_to, :visit
+    alias_method :goto, :visit
+    alias_method :save_screenshot, :screenshot
+    alias_method :execute_script, :run_script
+    alias_method :remove_cookies, :clear_cookies
+    alias_method :refresh_page, :refresh
+    alias_method :select_window, :within_window
+    alias_method :attach_to, :within_window
+  end
+end

data/lib/symbiont/service_objects.rb

@@ -14,7 +14,7 @@ module Symbiont
     end
 
     def connected?
-      not @client.nil?
+      !@client.nil?
     end
 
     def operations
@@ -47,7 +47,7 @@ module Symbiont
       operation = args.shift
       message = args.shift
       type = message.is_a?(String) ? :xml : :message
-      call(operation, { type => message })
+      call(operation, type => message)
     end
 
     def call(operation, data)
@@ -58,21 +58,21 @@ module Symbiont
     def client_properties
       properties = { log: false, ssl_version: :SSLv3, ssl_verify_mode: :none }
       [
-          :has_wsdl,
-          :has_proxy,
-          :has_basic_auth,
-          :has_digest_auth,
-          :has_encoding,
-          :has_soap_header,
-          :has_open_timeout,
-          :has_read_timeout,
-          :has_log_level,
-          :has_ssl_version,
-          :has_ssl_verification
+        :has_wsdl,
+        :has_proxy,
+        :has_basic_auth,
+        :has_digest_auth,
+        :has_encoding,
+        :has_soap_header,
+        :has_open_timeout,
+        :has_read_timeout,
+        :has_log_level,
+        :has_ssl_version,
+        :has_ssl_verification,
       ].each do |sym|
-        properties = properties.merge(self.send sym) if self.respond_to? sym
+        properties = properties.merge(send sym) if self.respond_to? sym
       end
       properties
     end
   end
-end
+end

data/lib/symbiont/soap_methods.rb

@@ -1,72 +1,73 @@
-module Symbiont::SoapObject
-  module SoapMethods
-    def wsdl(url)
-      define_method(:has_wsdl) do
-        @wsdl ||= url
-        { wsdl: @wsdl }
+module Symbiont
+  module SoapObject
+    module SoapMethods
+      def wsdl(url)
+        define_method(:has_wsdl) do
+          @wsdl ||= url
+          { wsdl: @wsdl }
+        end
       end
-    end
 
-    def proxy(url)
-      define_method(:has_proxy) do
-        { proxy: url }
+      def proxy(url)
+        define_method(:has_proxy) do
+          { proxy: url }
+        end
       end
-    end
 
-    def basic_auth(*creds)
-      define_method(:has_basic_auth) do
-        { basic_auth: creds }
+      def basic_auth(*creds)
+        define_method(:has_basic_auth) do
+          { basic_auth: creds }
+        end
       end
-    end
 
-    def digest_auth(*creds)
-      define_method(:has_digest_auth) do
-        { digest_auth: creds }
+      def digest_auth(*creds)
+        define_method(:has_digest_auth) do
+          { digest_auth: creds }
+        end
       end
-    end
 
-    def soap_header(header)
-      define_method(:has_soap_header) do
-        { soap_header: header }
+      def soap_header(header)
+        define_method(:has_soap_header) do
+          { soap_header: header }
+        end
       end
-    end
 
-    def encoding(enc)
-      define_method(:has_encoding) do
-        { encoding: enc }
+      def encoding(enc)
+        define_method(:has_encoding) do
+          { encoding: enc }
+        end
       end
-    end
 
-    def open_timeout(timeout)
-      define_method(:has_open_timeout) do
-        { open_timeout: timeout }
+      def open_timeout(timeout)
+        define_method(:has_open_timeout) do
+          { open_timeout: timeout }
+        end
       end
-    end
 
-    def read_timeout(timeout)
-      define_method(:has_read_timeout) do
-        { read_timeout: timeout }
+      def read_timeout(timeout)
+        define_method(:has_read_timeout) do
+          { read_timeout: timeout }
+        end
       end
-    end
 
-    def log_level(level)
-      define_method(:has_log_level) do
-        { log: true, log_level: level, pretty_print_xml: true }
+      def log_level(level)
+        define_method(:has_log_level) do
+          { log: true, log_level: level, pretty_print_xml: true }
+        end
       end
-    end
 
-    def ssl_version(version)
-      define_method(:has_ssl_version) do
-        { ssl_version: version }
+      def ssl_version(version)
+        define_method(:has_ssl_version) do
+          { ssl_version: version }
+        end
       end
-    end
 
-    def ssl_verification(enable)
-      if enable
+      def ssl_verification(enable)
+        return unless enable
         define_method(:has_ssl_verification) do
           { ssl_verify_mode: true }
         end
       end
     end
   end
-end
+end

data/lib/symbiont/version.rb

@@ -1,3 +1,3 @@
 module Symbiont
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

data/lib/symbiont.rb

@@ -12,7 +12,6 @@ require 'symbiont/assertions'
 require 'symbiont/pages'
 require 'symbiont/elements'
 require 'symbiont/accessor'
-require 'symbiont/workflows'
 require 'symbiont/factory'
 
 require 'symbiont/data_reader'
@@ -26,25 +25,22 @@ module Symbiont
   def self.included(caller)
     caller.extend Symbiont::Assertion
     caller.extend Symbiont::Element
-    
     caller.send :include, Symbiont::Page
     caller.send :include, Symbiont::Accessor
-
     caller.send :include, Symbiont::DataSetter
     caller.send :include, Symbiont::DataBuilder
-
     Symbiont.trace("#{caller.class} #{caller} has attached the Symbiont.")
   end
 
   def self.trace(message, level = 1)
     puts '*' * level + " #{message}" if ENV['SYMBIONT_TRACE'] == 'on'
   end
-  
-  def self.driver=(browser)
+
+  def self.browser=(browser)
     @browser = browser
   end
-  
-  def self.driver
+
+  def self.browser
     @browser
   end
 
@@ -52,48 +48,50 @@ module Symbiont
   attr_reader :browser
 
   # @param browser [Object] a tool driver instance
-  def initialize(browser=nil)
+  def initialize(browser = nil)
     Symbiont.trace("Symbiont attached to browser:\n\t#{browser.inspect}")
-    
-    @browser = Symbiont.driver unless Symbiont.driver.nil?
-    @browser = browser if Symbiont.driver.nil?
+
+    @browser = Symbiont.browser unless Symbiont.browser.nil?
+    @browser = browser if Symbiont.browser.nil?
 
     initialize_page if respond_to?(:initialize_page)
     initialize_activity if respond_to?(:initialize_activity)
   end
-end
 
-def attach(mod=Symbiont)
-  include mod
+  def self.set_browser(app = :firefox)
+    @browser = Watir::Browser.new(app)
+    Symbiont.browser = @browser
+  end
 end
 
-def symbiont_browser(browser=:firefox)
-  @browser = Watir::Browser.new browser
-  Symbiont.driver = @browser
+def attach(mod = Symbiont)
+  include mod
 end
 
-alias :symbiont_browser_for :symbiont_browser
-
 class Object
-  def call_method_chain(method_chain, arg=nil)
+  def call_method_chain(method_chain, arg = nil)
     return self if method_chain.empty?
-    method_chain.split('.').inject(self) { |o,m|
+    method_chain.split('.').inject(self) do |o, m|
       if arg.nil?
         o.send(m.intern)
       else
         o.send(m.intern, arg)
       end
-    }
+    end
   end
 end
 
-class Watir::CheckBox
-  alias_method :check, :set
-  alias_method :uncheck, :clear
-  alias_method :checked?, :set?
+module Watir
+  class CheckBox
+    alias_method :check, :set
+    alias_method :uncheck, :clear
+    alias_method :checked?, :set?
+  end
 end
 
-class Watir::Radio
-  alias_method :choose, :set
-  alias_method :chosen?, :set?
+module Watir
+  class Radio
+    alias_method :choose, :set
+    alias_method :chosen?, :set?
+  end
 end

data/symbiont.gemspec

@@ -30,17 +30,20 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.requirements  << 'Watir-WebDriver, Savon'
 
   spec.required_ruby_version     = '>= 2.0'
   spec.required_rubygems_version = '>= 1.8.29'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.1'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rubocop'
 
-  spec.add_runtime_dependency 'colorize', '~> 0.7'
-  spec.add_runtime_dependency 'watir-webdriver', '~> 0.6'
+  spec.add_runtime_dependency 'colorize'
+  spec.add_runtime_dependency 'watir-webdriver'
   spec.add_runtime_dependency 'watir-dom-wait'
   spec.add_runtime_dependency 'watir-scroll'
   spec.add_runtime_dependency 'savon'