watirmark 5.14.16 → 5.27.2

data/lib/watirmark/extensions/webdriver_extensions.rb

@@ -136,9 +136,13 @@ module Watir
   end
 
   class Element
-    alias :prev_sibling :previous_sibling
-    alias :prevsibling :previous_sibling
-    alias :nextsibling :next_sibling
+    begin
+      alias :prev_sibling :previous_sibling
+      alias :prevsibling :previous_sibling
+      alias :nextsibling :next_sibling
+    rescue NameError
+      # not using convio-specific webdriver. Ignore and continue
+    end
 
     def click_if_exists
       click if exists?
@@ -147,4 +151,35 @@ module Watir
     alias :click_no_wait :click
   end
 
+  class TextFieldLocator
+    def validate_element(element)
+      if element.tag_name.downcase == 'textarea'
+        warn "Locating textareas with '#text_field' is deprecated. Please, use '#textarea' method instead for #{@selector}"
+      end
+      super
+    end
+  end
+
+
 end
+
+module Selenium
+  module WebDriver
+    module Chrome
+      class Service
+        alias :stop_original :stop
+        def stop
+          watirmark_close_browser
+          stop_original
+        end
+
+        def watirmark_close_browser
+          return if @process.nil? || @process.exited? || @stopped
+          @stopped = true
+          config = Watirmark::Configuration.instance
+          Watirmark::Session.instance.closebrowser if config.closebrowseronexit || config.headless
+        end
+      end
+    end
+  end
+end

data/lib/watirmark/formatters/snapshot_formatter.rb

@@ -16,6 +16,9 @@ module RSpec
             snapshot = "#{Time.now.to_i} - #{append_text}.png"
             Page.browser.screenshot.save "#{@path}/#{snapshot}"
           end
+        rescue Exception => e
+          # an exception occurred.  We don't want exception to occur here or we'll get false positive test results.
+          Watirmark.logger.warn "An exception was rescued in example_failed for SnapshotFormatter.  This exception is ignored"
         end
       end
     end

data/lib/watirmark/models/cucumber_helper.rb

@@ -24,13 +24,20 @@ module Watirmark
       end
 
       def insert_model(text)
+        return text unless text.class == String || text.class == Cucumber::Ast::DocString
         result = text
-        regexp = /\[([^\]]+)\]\.(\w+)/
-        while result =~ regexp #get value from models
+        method_regexp = /\[([^\[\]]+)\]\.(\w+)/
+        model_regexp = /\[([^\[\]]+)\]/
+        if text =~ method_regexp
+          while result =~ method_regexp #get value from models
+            model_name = $1
+            method     = $2
+            value = DataModels[model_name].send method.to_sym
+            result.sub!(method_regexp, value.to_s)
+          end
+        elsif text =~ model_regexp
           model_name = $1
-          method     = $2
-          value = DataModels[model_name].send method.to_sym
-          result.sub!(regexp, value.to_s)
+          result = DataModels[model_name] if DataModels[model_name] != nil
         end
         result
       end

data/lib/watirmark/models/factory.rb

@@ -17,6 +17,16 @@ module Watirmark
       attr_accessor :defaults, :model_name, :models, :parent, :children, :model_type
       attr_reader   :keywords
 
+      def marshal_dump
+        [@keywords, @model_name, @models, @parent, @children, @model_type, self.to_h]
+      end
+
+      def marshal_load(obj)
+        keyword_values = obj.pop
+        @keywords, @model_name, @models, @parent, @children, @model_type = obj
+        update keyword_values
+      end
+
       def initialize(params={})
         @params = params
         @model_type = self.class.model_type_name
@@ -34,6 +44,12 @@ module Watirmark
         @uuid ||= (Watirmark::Configuration.instance.uuid || UUID.new.generate(:compact)[0..9]).to_s
       end
 
+      def hash_id(size = nil, type = :hex)
+        size = size || Watirmark::Configuration.instance.hash_id_length || 8
+        seed = Watirmark::Configuration.instance.hash_id_seed || "Watirmark Default Seed"
+        @hash_id ||= generate_hash_id seed, size, type
+      end
+
       def strip_equals_from_method_name(method)
         method.to_s.delete('=').to_sym
       end
@@ -49,6 +65,7 @@ module Watirmark
         @children << model
         create_child_methods
         Watirmark.logger.info "Added Model #{model.inspect} to #{model_name || model_class_name}"
+        return self
       end
 
 
@@ -102,8 +119,7 @@ module Watirmark
       end
 
       def remove_empty_entries hash
-        hash.delete(':')
-        hash.delete_if {|k| k =~ /^\s+$/}
+        hash.delete_if {|k| k.nil? || k == ':' || k =~ /^\s+$/ || k.empty?}
       end
 
       def to_h
@@ -124,6 +140,12 @@ module Watirmark
         h
       end
 
+      def unique_instance_name
+        class_name = self.class.name[/([^\:]+)Model$/i,1]
+        model_name_exists = model_name.nil? ? false : (not model_name.empty?)
+        unique_name = model_name_exists ? model_name : class_name.downcase
+        unique_name_with_uuid = unique_name + "_" + uuid
+      end
 
     private
 
@@ -163,6 +185,17 @@ module Watirmark
         model.model_class_name.to_s.sub(/Model$/, '').underscore
       end
 
+      def generate_hash_id(seed, size=8, type = :hex)
+        seed_int = seed.scan(/./).inject(1) { |product, chr| product * chr.ord }
+        prng     = Random.new(seed_int)
+        if type == :alpha
+          o = ('a'..'z').to_a + ('A'..'Z').to_a + (0..9).to_a
+        else #:hex
+          o = ('a'..'f').to_a + (0..9).to_a
+        end
+        (0...size.to_i).map { o.sample(random: prng) }.join
+      end
+
     end
   end
 end

data/lib/watirmark/page/page.rb

@@ -35,6 +35,7 @@ module Watirmark
       keywords = self.class.keyword_metadata || {}
       keywords.each_key do |key|
         keyed_element = KeyedElement.new(self, keywords[key])
+        next if !@keyed_elements.empty? and @keyed_elements.any? {|k| k.keyword.eql? keyed_element.keyword }
         @keyed_elements << keyed_element
         meta_def key do |*args|
           keyed_element.get *args

data/lib/watirmark/page/page_definition.rb

@@ -7,7 +7,7 @@ module Watirmark
                   :process_page_active_page_method,
                   :process_page_submit_method
 
-    def process_page(name, method=nil)
+    def process_page(name)
       @current_process_page = find_or_create_process_page(name)
       yield
       @current_process_page = @current_process_page.parent
@@ -33,7 +33,7 @@ module Watirmark
       @process_page_active_page_method = proc
     end
 
-  private
+    private
 
     def add_superclass_process_pages_to_subclass(klass)
       klass.process_pages = (@process_pages ? @process_pages.dup : klass.process_pages = [])
@@ -73,7 +73,6 @@ module Watirmark
   end
 
 
-
   module PageDefinition
     include ProcessPageDefinition
     attr_accessor :kwds, :perms, :kwd_metadata
@@ -102,6 +101,7 @@ module Watirmark
     def private_keyword(name, map=nil, &block)
       create_new_keyword(name, map, &block)
     end
+
     alias :navigation_keyword :private_keyword
 
     # Create an alias to an existing keyword
@@ -119,14 +119,16 @@ module Watirmark
     end
 
     def browser_exists?
-      !! @@browser
+      !!@@browser
     end
 
     def keywords
+      @kwds ||= Hash.new { |h, k| h[k] = Array.new }
       @kwds.values.flatten.uniq.sort_by { |key| key.to_s }
     end
 
     def native_keywords
+      @kwds ||= Hash.new { |h, k| h[k] = Array.new }
       @kwds[self.to_s].sort_by { |key| key.to_s }
     end
 
@@ -135,7 +137,7 @@ module Watirmark
       @kwd_metadata.values.inject(:merge)
     end
 
-  private
+    private
     def nested_hash
       Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k]=Hash.new } }
     end

data/lib/watirmark/profile.rb

@@ -1,13 +1,13 @@
 require 'ruby-prof'
 
 class Profiler
-  def self.profile(options={}, &block)
+  def self.profile(options={})
     RubyProf.start
     beginning = Time.now
     puts '-----------------------'
     puts options[:name]
     puts '-----------------------'
-    block.call
+    yield
     result = RubyProf.stop
     result.eliminate_methods!([/IO/, /Net::/, /Global/])
     printer = RubyProf::FlatPrinter.new(result)

data/lib/watirmark/rake/smoketest.rb

@@ -2,16 +2,18 @@ module SmokeTest
 
   class << self
     def rspec_task(task_name, files, tag=:smoke)
+      Dir.mkdir("reports") unless Dir.exists?("reports")
       RSpec::Core::RakeTask.new(task_name) do |spec|
-        spec.rspec_opts = "--tag #{tag} -fd -fh --out spec/reports/#{spec.name}.html --backtrace"
+        spec.rspec_opts = "--tag #{tag} --tag ~bug -fd -fh --out reports/#{spec.name}.html --backtrace"
         spec.pattern = files
       end
     end
 
     def cucumber_task(task_name, files=nil, tag=:smoke)
-       Cucumber::Rake::Task.new(task_name) do |t|
-         t.cucumber_opts = "--tags @#{tag} -r features #{FileList[files]} -b --format html -o reports/report.html --format pretty"
-       end
+      Dir.mkdir("reports") unless Dir.exists?("reports")
+      Cucumber::Rake::Task.new(task_name) do |t|
+        t.cucumber_opts = "--tags @#{tag} --tags ~@bug -r features #{FileList[files]} -b --format html -o reports/report.html --format pretty"
+      end
     end
   end
 end

data/lib/watirmark/screenshot.rb

@@ -20,9 +20,9 @@ module Watirmark
       end
 
       def compare_specific_screenshot_size(currents, masters)
-         unless currents.screenshots.md5 == masters.album.md5
-           report_failure(currents.screenshots.filename, masters.album.filename)
-         end
+       unless currents.screenshots.md5 == masters.album.md5
+         report_failure(currents.screenshots.filename, masters.album.filename)
+       end
       end
 
       def compare_standard_screenshot_sizes(currents, masters)
@@ -82,7 +82,6 @@ module Watirmark
       def take_screen_shot(snapshotwidth)
         update_window_size(snapshotwidth)
         @filename = "reports/screenshots/#{UUID.new.generate(:compact)}.png"
-        focus_browser
         Page.browser.screenshot.save @filename
       end
 
@@ -103,10 +102,6 @@ module Watirmark
       def revert_window_size
         Page.browser.window.resize_to(@screenwidth, @screenheight)
       end
-
-      def focus_browser
-        Page.browser.element.click
-      end
     end
 
     class Master < Current

data/lib/watirmark/session.rb

@@ -4,6 +4,7 @@ module Watirmark
   # post failures and then compare on a cucumber step
   module CucumberPostFailureBuffering
     @@buffer_post_failure = false
+    @@post_failure = nil
 
     def post_failure
       @@post_failure
@@ -17,10 +18,10 @@ module Watirmark
       @@buffer_post_failure
     end
 
-    def catch_post_failures(&block)
+    def catch_post_failures
       @@post_failure = nil
       @@buffer_post_failure = true
-      block.call
+      yield
       @@buffer_post_failure = false
       @@post_failure
     end
@@ -47,12 +48,28 @@ module Watirmark
     # set up the global variables, reading from the config file
     def initialize
       Watirmark.add_exit_task {
-        closebrowser if config.closebrowseronexit
+        closebrowser if config.closebrowseronexit || config.headless
+        @driver.quit if config.webdriver.to_s.eql? 'sauce'
       }
-      config.firefox_profile = default_firefox_profile if config.webdriver.to_s == 'firefox'
+
+      if config.webdriver.to_s.eql? 'firefox'
+        config.firefox_profile = default_firefox_profile
+      elsif config.webdriver.to_s.eql? 'firefox_proxy'
+        config.firefox_profile = proxy_firefox_profile(config.proxy_host, config.proxy_port)
+      end
     end
 
     def default_firefox_profile
+      file_types = "text/comma-separated-values,text/csv,application/pdf, application/x-msdos-program, application/x-unknown-application-octet-stream,
+              application/vnd.ms-powerpoint, application/excel, application/vnd.ms-publisher, application/x-unknown-message-rfc822, application/vnd.ms-excel,
+              application/msword, application/x-mspublisher, application/x-tar, application/zip, application/x-gzip, application/x-stuffit,
+              application/vnd.ms-works, application/powerpoint, application/rtf, application/postscript, application/x-gtar,
+              video/quicktime, video/x-msvideo, video/mpeg, audio/x-wav, audio/x-midi, audio/x-aiff, text/plain, application/vnd.ms-excel [official],
+              application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/msexcel, application/x-msexcel,
+              application/x-excel, application/vnd.ms-excel, application/excel, application/x-ms-excel, application/x-dos_ms_excel,
+              text/csv, text/comma-separated-values, application/octet-stream, application/haansoftxls, application/msexcell,
+              application/softgrid-xls, application/vnd.ms-excel, x-softmaker-pm"
+
       if Configuration.instance.default_firefox_profile
         Watirmark.logger.info "Using firefox profile: #{Configuration.instance.default_firefox_profile}"
         profile = Selenium::WebDriver::Firefox::Profile.from_name Configuration.instance.default_firefox_profile
@@ -65,8 +82,32 @@ module Watirmark
         download_directory.gsub!("/", "\\") if Selenium::WebDriver::Platform.windows?
         profile['browser.download.folderList'] = 2 # custom location
         profile['browser.download.dir'] = download_directory
-        profile['browser.helperApps.neverAsk.saveToDisk'] = "text/csv,application/pdf"
+        profile['browser.helperApps.neverAsk.saveToDisk'] = file_types
+        profile['security.warn_entering_secure'] =  false
+        profile['security.warn_submit_insecure'] = false
+        profile['security.warn_entering_secure.show_once'] = false
+        profile['security.warn_entering_weak'] =  false
+        profile['security.warn_entering_weak.show_once'] =  false
+        profile['security.warn_leaving_secure'] =  false
+        profile['security.warn_leaving_secure.show_once'] =  false
+        profile['security.warn_viewing_mixed'] =  false
+        profile['security.warn_viewing_mixed.show_once'] =  false
+        profile['security.mixed_content.block_active_content'] = false
       end
+      profile["focusmanager.testmode"] = true
+      profile
+    end
+
+    def proxy_firefox_profile(hostname,port)
+      profile = default_firefox_profile
+      profile['network.proxy.http'] = hostname
+      profile['network.proxy.http_port'] = port.to_i
+      profile['network.proxy.ssl'] = hostname
+      profile['network.proxy.ssl_port'] = port.to_i
+      profile['network.proxy.ftp'] = hostname
+      profile['network.proxy.ftp_port'] = port.to_i
+      profile['network.proxy_type'] = 1
+      profile['network.proxy.type'] = 1
       profile
     end
 
@@ -76,35 +117,90 @@ module Watirmark
     end
 
     def openbrowser
+      use_headless_display if config.headless
       Page.browser = new_watir_browser
       initialize_page_checkers
-      initialize_screenshots
       Page.browser
     end
 
     def closebrowser
       begin
         Page.browser.close
-      rescue Errno::ECONNREFUSED
+      rescue Errno::ECONNREFUSED, Selenium::WebDriver::Error::WebDriverError
         # browser already closed or unavailable
       ensure
         Page.browser = nil
       end
+
+      if @headless
+        @headless.destroy
+        @headless = nil
+      end
+    end
+
+    def getos
+      case RUBY_PLATFORM
+        when /cygwin|mswin|mingw|bccwin|wince|emx/
+          return "windows"
+        when /darwin/
+          return "mac"
+        when /linux/
+          return "linux"
+      end
     end
 
     private
 
+    def use_headless_display
+      unless RbConfig::CONFIG['host_os'].match('linux')
+        warn "Headless only supported on Linux"
+        return
+      end
+      require 'headless'
+      @headless = Headless.new
+      @headless.start
+    end
+
     def new_watir_browser
       config.webdriver ||= :firefox
       if config.webdriver.to_sym == :firefox
         Watir::Browser.new config.webdriver.to_sym, :profile => config.firefox_profile
+      elsif config.webdriver.to_sym == :firefox_proxy
+        Watir::Browser.new :firefox, :profile => config.firefox_profile
+      elsif config.webdriver.to_sym == :sauce
+        Watir::Browser.new use_sauce
       else
         Watir::Browser.new config.webdriver.to_sym
       end
     end
 
-    def initialize_screenshots
-      Page.browser.screenshot.base64
+    def use_sauce
+      sb   = config.sauce_browser.nil? ? "firefox" : config.sauce_browser.to_s
+      caps = sauce_config(sb)
+
+      @driver = Selenium::WebDriver.for(
+        :remote,
+        :url                  => "http://#{config.sauce_username}:#{config.sauce_access_key}@ondemand.saucelabs.com:80/wd/hub",
+        :desired_capabilities => caps)
+      @driver
+    end
+
+    def sauce_config(sb)
+      caps              = Selenium::WebDriver::Remote::Capabilities.send(sb.to_sym)
+      caps.browser_name = sb
+      case sb
+        when "firefox"
+          caps.version = config.sauce_browser_version.nil? ? 26 : config.sauce_browser_version.to_i
+        when "chrome"
+          caps.version = config.sauce_browser_version.nil? ? 32 : config.sauce_browser_version.to_i
+        when "ie"
+          caps.browser_name = "internet explorer" # caps.browser_name requires ie to be full name
+          caps.version      = config.sauce_browser_version.nil? ? 10 : config.sauce_browser_version.to_i
+      end
+      caps.platform = config.sauce_os.nil? ? "Windows 7" : config.sauce_os.to_s
+      caps[:name]   = config.sauce_test_title.nil? ? "Testing Selenium 2 with Ruby on Sauce" : config.sauce_test_title
+      puts caps
+      caps
     end
 
     def initialize_page_checkers

data/lib/watirmark/version.rb

@@ -1,5 +1,5 @@
 module Watirmark
   module Version
-    STRING = '5.14.16'
+    STRING = '5.27.2'
   end
 end

data/lib/watirmark.rb

@@ -1,11 +1,3 @@
-if RUBY_VERSION != "1.9.3"
-  warn "
-************************************************************************
-Using unsupported Ruby version #{RUBY_VERSION}. Please upgrade to 1.9.3
-************************************************************************
-"
-end
-
 require 'watirmark/configuration'
 Watirmark::Configuration.instance.reload
 
@@ -23,4 +15,5 @@ require 'uuid'
 require 'watirmark/model'
 require 'watirmark/rake/smoketest'
 require 'active_support/inflector'
+require 'watirmark/screenshot'
 FileUtils.rm_rf('reports/screenshots')

data/spec/config_spec.rb

@@ -1,16 +1,58 @@
 require_relative 'spec_helper'
 
-shared_examples_for "configuration_file" do
+describe "text file" do
+
+  before :all do
+    @config = Watirmark::Configuration.instance
+    @config.reset
+    @config.configfile = File.dirname(__FILE__) + '/configurations/config.txt'
+    @config.read_from_file
+  end
+
+ specify 'string' do
+   @config.string.should == "foo"
+ end
+
+ specify 'true_boolean' do
+   @config.true_boolean.should == true
+ end
+
+ specify 'false_boolean' do
+   @config.false_boolean.should == false
+ end
+
+ specify 'symbol' do
+   @config.symbol.should == :foo
+ end
+
+ specify 'integer' do
+   @config.integer.should == 3
+ end
+
+ specify 'float' do
+   @config.float.should == 1.2
+ end
+end
+
+describe "yaml file" do
+
+  before :all do
+    @config = Watirmark::Configuration.instance
+    @config.reset
+    @config.configfile = File.dirname(__FILE__) + '/configurations/config.yml'
+    @config.read_from_file
+  end
+
   specify 'string' do
     @config.string.should == "foo"
   end
 
   specify 'true_boolean' do
-    @config.true_boolean.should be_true
+    @config.true_boolean.should == true
   end
 
   specify 'false_boolean' do
-    @config.false_boolean.should be_false
+    @config.false_boolean.should == false
   end
 
   specify 'symbol' do
@@ -26,28 +68,6 @@ shared_examples_for "configuration_file" do
   end
 end
 
-describe "text file" do
- it_behaves_like  "configuration_file"
-
-  before :all do
-    @config = Watirmark::Configuration.instance
-    @config.reset
-    @config.configfile = File.dirname(__FILE__) + '/configurations/config.txt'
-    @config.read_from_file
-  end
-end
-
-describe "yaml file" do
-  it_behaves_like  "configuration_file"
-
-  before :all do
-    @config = Watirmark::Configuration.instance
-    @config.reset
-    @config.configfile = File.dirname(__FILE__) + '/configurations/config.yml'
-    @config.read_from_file
-  end
-end
-
 describe "configuration" do
   before :all do
     @config = Watirmark::Configuration.instance
@@ -66,17 +86,5 @@ describe "configuration" do
   specify 'inspect' do
     @config.inspect.should =~ /^{.+}/
   end
-  
-  specify 'override how a setting is set' do
-    module Watirmark
-      class Configuration
-        def hostname_value(hostname)
-          hostname + '/test'
-        end
-      end
-    end
-    Watirmark::Configuration.instance.hostname = 'www.convio.com'
-    Watirmark::Configuration.instance.hostname.should == 'www.convio.com/test'
-  end
 
 end