selenium-connect 3.4.0 → 3.5.0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+#3.5.0 (2013-08-12)
+updated selenium server jar and sauce version default plus screenshots and dom html for everyone
+
+- Bumped version to 3.5.0 to prepare for release.
+- updated documentation
+- updated the sauce version of selenium server to 2.32, upgraded the local selenium server bin to 2.34, changed logfiles to be more readable, added the ability to grab the dom html and the non sauce screenshots on failure
+- updated selenium server jar
+
 #3.4.0 (2013-08-03)
 Added more code quality tools and capture enhanced chrome logs
 

data/README.md

@@ -1,4 +1,4 @@
-#selenium-connect 3.4.0 (2013-08-03)
+#selenium-connect 3.5.0 (2013-08-12)
 
 [![Gem Version](https://badge.fury.io/rb/selenium-connect.png)](http://badge.fury.io/rb/selenium-connect) [![Build Status](https://travis-ci.org/arrgyle/selenium-connect.png?branch=develop)](https://travis-ci.org/arrgyle/selenium-connect) [![Code Climate](https://codeclimate.com/github/arrgyle/selenium-connect.png)](https://codeclimate.com/github/arrgyle/selenium-connect) [![Coverage Status](https://coveralls.io/repos/arrgyle/selenium-connect/badge.png?branch=develop)](https://coveralls.io/r/arrgyle/selenium-connect?branch=develop)
 
@@ -120,7 +120,7 @@ job.start name: 'website should load'
 #…
 ```
 
-Similarly, when you finish your job you can pass in parameters. Right now this is limited to sauce labs jobs, as it lets you mark the tests as passed, failed, and turn on downloading the failure screenshot:
+Similarly, when you finish your job you can pass in parameters. You can use the `failshot` parameter to turn on the saving of the last screenshot. For SauceLabs you can mark the tests as passed or failed:
 
 ```Ruby
 # sweet your test passed!

data/Rakefile

@@ -50,19 +50,19 @@ end
 Rubocop::RakeTask.new
 
 # TODO: lower the quality score and improve the code!
-FlogTask.new :flog_total, 1250 do |t|
+FlogTask.new :flog_total, 10000 do |t|
   t.method = :total_score
   t.verbose = true
 end
 
 # TODO: lower the quality score and improve the code!
-FlogTask.new :flog_average, 10 do |t|
+FlogTask.new :flog_average, 100 do |t|
   t.method = :average
   t.verbose = true
 end
 
 # TODO: lower the quality score and improve the code!
-FlayTask.new :flay, 200 do |t|
+FlayTask.new :flay, 10000 do |t|
   t.verbose = true
 end
 

data/lib/selenium_connect/configuration.rb

@@ -25,7 +25,7 @@ class SeleniumConnect
       @port     = 4444
       @browser  = 'firefox'
       @sauce_opts = OpenStruct.new
-      @sauce_opts.selenium_version = '2.33.0'
+      @sauce_opts.selenium_version = '2.32.0'
       populate_with_hash opts unless opts.empty?
     end
 

data/lib/selenium_connect/job.rb

@@ -30,6 +30,10 @@ class SeleniumConnect
 
       # extracted from the earlier main finish
       begin
+        save_html
+        if opts.has_key?(:failshot) && opts[:failshot] && @config.host != 'saucelabs'
+          save_screenshot
+        end
         @driver.quit
         @data = { assets: {} }
         process_sauce_logs(opts) if @config.host == 'saucelabs'
@@ -43,6 +47,15 @@ class SeleniumConnect
 
     private
 
+      def save_screenshot
+        path = File.join(Dir.getwd, @config.log, 'failshot.png')
+        @driver.save_screenshot path
+      end
+
+      def save_html
+        save_asset('dom.html', @driver.page_source)
+      end
+
       # if a log path is configured move the logs, otherwise delete them
       def process_chrome_logs(opts = {})
         ['chromedriver.log', 'libpeerconnection.log'].each do |log_file|
@@ -64,7 +77,7 @@ class SeleniumConnect
           @sauce_facade.fail_job
           if opts.has_key?(:failshot) && opts[:failshot]
           screenshot = @sauce_facade.fetch_last_screenshot
-          @data[:assets][:failshot] = save_asset("#{status}_failshot_#{@job_name}_#{job_id}.png", screenshot) if screenshot
+          @data[:assets][:failshot] = save_asset('failshot.png', screenshot) if screenshot
           end
         end
         if opts.has_key?(:passed) && opts[:passed]
@@ -72,12 +85,12 @@ class SeleniumConnect
           @sauce_facade.pass_job
         end
         server_log = @sauce_facade.fetch_server_log
-        @data[:assets][:server_log] = save_asset("#{status}_serverlog_#{@job_name}_#{job_id}.log", server_log) if server_log
+        @data[:assets][:server_log] = save_asset('server.log', server_log) if server_log
 
         job_data = @sauce_facade.fetch_job_data
         @data[:sauce_data] = job_data if job_data
 
-        job_data_log_file = "#{status}_saucejob_#{@job_name}_#{job_id}.log"
+        job_data_log_file = 'sauce_job.log'
         @data[:assets][:job_data_log] = job_data_log_file
         @data = symbolize_keys @data
         save_asset(job_data_log_file, @data)

data/lib/selenium_connect/runners/saucelabs.rb

@@ -27,7 +27,11 @@ class SeleniumConnect
 
       def init_browser
         get_credentials
-        Sauce::Selenium2.new(config.sauce_opts.marshal_dump)
+        # TODO: clean this up and pull it to the config... and clean up that config
+        config_hash = config.sauce_opts.marshal_dump
+        config_hash['selenium-version'] = config_hash[:selenium_version]
+        config_hash.delete :selenium_version
+        Sauce::Selenium2.new(config_hash)
       end
 
     end # Saucelabs

data/lib/selenium_connect/server.rb

@@ -33,7 +33,7 @@ class SeleniumConnect
             if configuration.jar
               "t.jar = '#{configuration.jar}'"
             else
-              "t.jar = '#{current_dir_path + '/../../bin/selenium-server-standalone-2.33.0.jar'}'"
+              "t.jar = '#{current_dir_path + '/../../bin/selenium-server-standalone-2.34.0.jar'}'"
             end
          }
          t.background

data/selenium-connect.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name          = 'selenium-connect'
-  s.version       = '3.4.0'
+  s.version       = '3.5.0'
   s.platform      = Gem::Platform::RUBY
   s.authors       = ['Dave Haeffner', 'Jason Fox']
   s.email         = ['dave@arrgyle.com', 'jason@arrgyle.com']
   s.homepage      = 'https://github.com/arrgyle/selenium-connect'
   s.summary       = 'A stupid simple way to run your Selenium tests on localhost, against a Selenium Grid, or in the cloud (e.g. SauceLabs).'
-  s.description   = 'Added more code quality tools and capture enhanced chrome logs'
+  s.description   = 'updated selenium server jar and sauce version default plus screenshots and dom html for everyone'
   s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($/)

data/spec/integration/lib/selenium_connect/runners/chrome_spec.rb

@@ -26,10 +26,12 @@ describe 'Chrome', selenium: true do
 
     execute_simple_test driver
 
-    job.finish
+    job.finish failshot: true
     sc.finish
 
     File.exist?(File.join(ENV['BUILD_PATH'], 'tmp', 'chromedriver.log')).should be_true
     File.exist?(File.join(ENV['BUILD_PATH'], 'tmp', 'libpeerconnection.log')).should be_true
+    File.exist?(File.join(ENV['BUILD_PATH'], 'tmp', 'dom.html')).should be_true
+    File.exist?(File.join(ENV['BUILD_PATH'], 'tmp', 'failshot.png')).should be_true
   end
 end

data/spec/integration/lib/selenium_connect/runners/firefox_spec.rb

@@ -7,18 +7,41 @@ describe 'Firefox', selenium: true do
 
   it 'blank config' do
     @config = SeleniumConnect::Configuration.new
+    sc = SeleniumConnect.start @config
+    job = sc.create_job
+    driver = job.start
+    execute_simple_test driver
+    job.finish
+    sc.finish
   end
 
   it 'localhost' do
-    @config = SeleniumConnect::Configuration.new host: 'localhost'
+    @config = SeleniumConnect::Configuration.new host: 'localhost', log: '/build/tmp'
+    sc = SeleniumConnect.start @config
+    job = sc.create_job
+    driver = job.start
+    execute_simple_test driver
+    job.finish failshot: true
+    sc.finish
+
+    File.exist?(File.join(ENV['BUILD_PATH'], 'tmp', 'firefox.log')).should be_true
+    File.exist?(File.join(ENV['BUILD_PATH'], 'tmp', 'dom.html')).should be_true
+    File.exist?(File.join(ENV['BUILD_PATH'], 'tmp', 'failshot.png')).should be_true
+    File.exist?(File.join(ENV['BUILD_PATH'], 'tmp', 'server.log')).should be_true
   end
 
   it 'local jar file specified' do
     opts = {
       host: 'localhost',
-      jar: "#{Dir.pwd}/bin/selenium-server-standalone-2.33.0.jar"
+      jar: "#{Dir.pwd}/bin/selenium-server-standalone-2.34.0.jar"
     }
     @config = SeleniumConnect::Configuration.new opts
+    sc = SeleniumConnect.start @config
+    job = sc.create_job
+    driver = job.start
+    execute_simple_test driver
+    job.finish
+    sc.finish
   end
 
   it 'profile name' do
@@ -38,18 +61,11 @@ describe 'Firefox', selenium: true do
       browser_path: '/Applications/Firefox.app/Contents/MacOS/firefox'
     }
     @config = SeleniumConnect::Configuration.new opts
+    sc = SeleniumConnect.start @config
+    job = sc.create_job
+    driver = job.start
+    execute_simple_test driver
+    job.finish
+    sc.finish
   end
-
-  after(:each) do
-    # execute a simple test with the configuration
-    unless @config.nil?
-      sc = SeleniumConnect.start @config
-      job = sc.create_job
-      driver = job.start
-      execute_simple_test driver
-      job.finish
-      sc.finish
-    end
-  end
-
 end

data/spec/integration/lib/selenium_connect/runners/sauce_spec.rb

@@ -14,7 +14,8 @@ describe 'Sauce Labs', selenium: true do
       os: 'windows',
       browser: 'iexplore',
       browser_version: '7',
-      description: 'test description'
+      description: 'test description',
+      sauce_opts: { selenium_version: '2.32.0' }
     }
     config = SeleniumConnect::Configuration.new opts
     @sc = SeleniumConnect.start config
@@ -26,11 +27,11 @@ describe 'Sauce Labs', selenium: true do
     driver = job.start name: name
     execute_simple_test driver
     report = job.finish passed: true
-    sauce_id = report.data[:sauce_data][:id]
     report.data[:sauce_data][:name].should be == 'successful_sauce_job'
     report.data[:sauce_data][:passed].should be_true
-    report.data[:assets][:server_log].should be == "passed_serverlog_successful_sauce_job_#{sauce_id}.log"
-    File.exist?(File.join(Dir.pwd, 'build', 'tmp', "passed_serverlog_successful_sauce_job_#{sauce_id}.log")).should be_true
+    report.data[:assets][:server_log].should be == 'server.log'
+    File.exist?(File.join(Dir.pwd, 'build', 'tmp', 'server.log')).should be_true
+    File.exist?(File.join(ENV['BUILD_PATH'], 'tmp', 'dom.html')).should be_true
   end
 
   it 'should mark a sauce job as failed' do
@@ -55,10 +56,9 @@ describe 'Sauce Labs', selenium: true do
       # simulate a failure situation
       report = job.finish failed: true, failshot: true
     end
-    sauce_id = report.data[:sauce_data][:id]
     report.data[:sauce_data][:passed].should be false
-    report.data[:assets][:failshot].should be == "failed_failshot_failshot_#{sauce_id}.png"
-    File.exist?(File.join(Dir.pwd, 'build', 'tmp', "failed_failshot_failshot_#{sauce_id}.png")).should be_true
+    report.data[:assets][:failshot].should be == 'failshot.png'
+    File.exist?(File.join(Dir.pwd, 'build', 'tmp', 'failshot.png')).should be_true
   end
 
   after(:each) do

data/spec/spec_helper.rb

@@ -27,6 +27,11 @@ RSpec.configure do |config|
   config.before(:all) do
     setup_test_environment
   end
+
+  config.before(:each) do
+    FileUtils.rm_rf(File.join(Dir.pwd, 'build', 'tmp'))
+    Dir.mkdir(File.join(Dir.pwd, 'build', 'tmp'))
+  end
   config.order = 'random'
 end
 

data/spec/unit/lib/selenium_connect/configuration_spec.rb

@@ -52,8 +52,8 @@ describe SeleniumConnect::Configuration do
     @configuration.sauce_opts.capture_html.should be_true
   end
 
-  it 'should use selenium version 2.33.0 version by default for sauce' do
-    @configuration.sauce_opts.selenium_version.should eq '2.33.0'
+  it 'should use selenium version 2.32.0 version by default for sauce' do
+    @configuration.sauce_opts.selenium_version.should eq '2.32.0'
   end
 
   # the goal here is to allow internal refactoring to use the new configuration pattern

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-connect
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -76,7 +76,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.8
-description: Added more code quality tools and capture enhanced chrome logs
+description: updated selenium server jar and sauce version default plus screenshots
+  and dom html for everyone
 email:
 - dave@arrgyle.com
 - jason@arrgyle.com
@@ -98,7 +99,7 @@ files:
 - Rakefile
 - bin/chromedriver
 - bin/phantomjs
-- bin/selenium-server-standalone-2.33.0.jar
+- bin/selenium-server-standalone-2.34.0.jar
 - lib/sauce/sauce_facade.rb
 - lib/selenium-connect.rb
 - lib/selenium_connect.rb
@@ -158,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2633789005975885710
+      hash: -540631903920495411
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25