selenium-connect 3.5.0 → 3.6.0

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+#3.6.0 (2013-08-18)
+upgraded selenium version and improved chrome log storage
+
+- Bumped version to 3.6.0 to prepare for release.
+- more code quality fixes
+- code quality fixes
+- cleaned up the server class a little and added sensible chrome log file saving to the jar so we don\'t move files around
+- upgraded to newer version of jar file
+
 #3.5.0 (2013-08-12)
 updated selenium server jar and sauce version default plus screenshots and dom html for everyone
 

data/README.md

@@ -1,4 +1,4 @@
-#selenium-connect 3.5.0 (2013-08-12)
+#selenium-connect 3.6.0 (2013-08-18)
 
 [![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)
 

data/lib/selenium_connect/configuration.rb

@@ -48,7 +48,7 @@ class SeleniumConnect
     end
 
     def populate_with_yaml(file)
-        populate_with_hash YAML.load_file file
+      populate_with_hash YAML.load_file file
     end
 
     # The below methods are setters for the explicitly defined sauce and browser

data/lib/selenium_connect/job.rb

@@ -37,7 +37,6 @@ class SeleniumConnect
         @driver.quit
         @data = { assets: {} }
         process_sauce_logs(opts) if @config.host == 'saucelabs'
-        process_chrome_logs(opts) if @config.browser == 'chrome'
       # rubocop:disable HandleExceptions
       rescue Selenium::WebDriver::Error::WebDriverError
       # rubocop:enable HandleExceptions
@@ -56,19 +55,6 @@ class SeleniumConnect
         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|
-          path = File.join(Dir.getwd, log_file)
-
-          if @config.log
-            FileUtils.mv(path, File.join(Dir.getwd, @config.log)) if File.exist? path
-          else
-            FileUtils.rm path if File.exist? path
-          end
-        end
-      end
-
       def process_sauce_logs(opts = {})
         job_id = @driver.session_id
         @sauce_facade.job_id = job_id
@@ -76,7 +62,7 @@ class SeleniumConnect
           status = 'failed'
           @sauce_facade.fail_job
           if opts.has_key?(:failshot) && opts[:failshot]
-          screenshot = @sauce_facade.fetch_last_screenshot
+            screenshot = @sauce_facade.fetch_last_screenshot
           @data[:assets][:failshot] = save_asset('failshot.png', screenshot) if screenshot
           end
         end

data/lib/selenium_connect/server.rb

@@ -25,41 +25,35 @@ class SeleniumConnect
 
     private
 
-    def generate_rake_task
-      "require 'selenium/rake/server_task'
-
-       Selenium::Rake::ServerTask.new(:server) do |t|
-         #{
-            if configuration.jar
-              "t.jar = '#{configuration.jar}'"
-            else
-              "t.jar = '#{current_dir_path + '/../../bin/selenium-server-standalone-2.34.0.jar'}'"
-            end
-         }
-         t.background
-         #{
+      def get_rake_file
+        rake_file_path = current_dir_path + '/rake.task'
+        File.open(rake_file_path, 'w') do |file|
+          file.puts "require 'selenium/rake/server_task'"
+          file.puts 'Selenium::Rake::ServerTask.new(:server) do |t|'
+          if configuration.jar
+            file.puts "t.jar = '#{configuration.jar}'"
+          else
+            file.puts "t.jar = '#{current_dir_path + '/../../bin/selenium-server-standalone-2.35.0.jar'}'"
+          end
+          file.puts 't.background'
           if configuration.log
-            "t.log = '#{File.join(Dir.getwd, configuration.log, 'server.log')}'"
+            file.puts "t.log = '#{File.join(Dir.getwd, configuration.log, 'server.log')}'"
           else
-            "t.log = false"
+            file.puts 't.log = false'
           end
-         }
-         t.port = #{configuration.port}
-         #{
-            if configuration.browser == 'chrome'
-              "t.opts = '-Dwebdriver.chrome.driver=#{current_dir_path + '/../../bin/chromedriver'}'"
+          file.puts "t.port = #{configuration.port}"
+          opts = ''
+          if configuration.browser == 'chrome'
+            opts += '-Dwebdriver.chrome.driver=' + current_dir_path + '/../../bin/chromedriver'
+            if configuration.log
+              opts += ' -Dwebdriver.chrome.logfile=' + File.join(Dir.getwd, configuration.log, 'chrome.log')
             end
-         }
-       end"
-    end
-
-    def get_rake_file
-      rake_file_path = current_dir_path + '/rake.task'
-      rake_file = File.open(rake_file_path, 'w')
-      rake_file << generate_rake_task
-      rake_file.close
-      rake_file_path
-    end
+            file.puts "t.opts = %w[#{opts}]"
+          end
+          file.puts 'end'
+        end
+          rake_file_path
+      end
 
     def rake(task)
       system "rake -f #{get_rake_file} server:#{task}"

data/selenium-connect.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name          = 'selenium-connect'
-  s.version       = '3.5.0'
+  s.version       = '3.6.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   = 'updated selenium server jar and sauce version default plus screenshots and dom html for everyone'
+  s.description   = 'upgraded selenium version and improved chrome log storage'
   s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($/)

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

@@ -29,8 +29,7 @@ describe 'Chrome', selenium: true do
     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', 'chrome.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

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

@@ -33,7 +33,7 @@ describe 'Firefox', selenium: true do
   it 'local jar file specified' do
     opts = {
       host: 'localhost',
-      jar: "#{Dir.pwd}/bin/selenium-server-standalone-2.34.0.jar"
+      jar: "#{Dir.pwd}/bin/selenium-server-standalone-2.35.0.jar"
     }
     @config = SeleniumConnect::Configuration.new opts
     sc = SeleniumConnect.start @config

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

@@ -9,14 +9,14 @@ describe 'Headless', selenium: true do
   let(:quit)    { SeleniumConnect.finish }
 
   before(:each) do
-      config = SeleniumConnect::Configuration.new browser: 'phantomjs'
-      @sc = SeleniumConnect.start config
-      @job = @sc.create_job
-      @driver = @job.start
+    config = SeleniumConnect::Configuration.new browser: 'phantomjs'
+    @sc = SeleniumConnect.start config
+    @job = @sc.create_job
+    @driver = @job.start
   end
 
   it 'should run a basic test with phantom js' do
-      execute_simple_test @driver
+    execute_simple_test @driver
   end
 
   it 'should not find something on a page' do
@@ -26,8 +26,8 @@ describe 'Headless', selenium: true do
   end
 
   after(:each) do
-      @job.finish
-      @sc.finish
+    @job.finish
+    @sc.finish
   end
 
 end

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

@@ -14,8 +14,8 @@ describe 'Sauce Labs', selenium: true do
       os: 'windows',
       browser: 'iexplore',
       browser_version: '7',
-      description: 'test description',
-      sauce_opts: { selenium_version: '2.32.0' }
+      sauce_opts: { selenium_version: '2.32.0' },
+      description: 'test description'
     }
     config = SeleniumConnect::Configuration.new opts
     @sc = SeleniumConnect.start config

metadata

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