selenium-connect 2.0.0 → 2.1.0

data/.rubocop.yml

@@ -0,0 +1,8 @@
+LineLength:
+  Enabled: false
+
+MethodLength:
+  Max: 30
+
+EndAlignment:
+  Enabled: true

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p429
+ruby-1.9.3

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+notifications:
+  hipchat: 2a07784c1aeed1b6efa332242d3fc3@Regulation Station

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+#2.1.0 (2013-07-02)
+
 #2.0.0 (2013-06-27)
 - Added selenium server jar as explicit dependency
 - Updated ruby version

data/README.md

@@ -1,3 +1,7 @@
+Master Branch: [![Build Status](https://travis-ci.org/arrgyle/selenium-connect.png?branch=master)](https://travis-ci.org/arrgyle/selenium-connect)
+
+Develop Branch: [![Build Status](https://travis-ci.org/arrgyle/selenium-connect.png?branch=develop)](https://travis-ci.org/arrgyle/selenium-connect)
+
 #selenium-connect [![Code Climate](https://codeclimate.com/github/arrgyle/selenium-connect.png)](https://codeclimate.com/github/arrgyle/selenium-connect)
 
 A stupid simple way to run your Selenium tests on your computer, against a Selenium Grid, or in the cloud (e.g. SauceLabs).
@@ -19,24 +23,24 @@ SeleniumConnect.finish
 ## Helpful bits
 
 ### Start
-If host is set to "localhost" and no jar file is specified, it will run the version of [selenium-standalone-server.jar](https://code.google.com/p/selenium/downloads/list) that is bundled with the library (currently 2.33.0). Or, you can specify your own jar if you have one you prefer to use. This is done with c.jar = 'path-to-jar-file'.  
+If host is set to "localhost" and no jar file is specified, it will run the version of [selenium-standalone-server.jar](https://code.google.com/p/selenium/downloads/list) that is bundled with the library (currently 2.33.0). Or, you can specify your own jar if you have one you prefer to use. This is done with c.jar = 'path-to-jar-file'.
 
-If no additional parameters are set, the Selenium Server will be run in the background with logging disabled. If a logging directory is provided (with c.log = 'path-to-log-dir') then 3 output files will be generated:  
-+ Selenium Server JSON Wire Protocol output (server.log)  
-+ Browser output (browser.log) -- currently only available for Firefox  
-+ Test output (SPEC-testname.xml)  
+If no additional parameters are set, the Selenium Server will be run in the background with logging disabled. If a logging directory is provided (with c.log = 'path-to-log-dir') then 3 output files will be generated:
++ Selenium Server JSON Wire Protocol output (server.log)
++ Browser output (browser.log) -- currently only available for Firefox
++ Test output (SPEC-testname.xml)
 
-This localhost functionality is driven using the [Selenium Rake Server Task](http://selenium.googlecode.com/svn/trunk/docs/api/rb/Selenium/Rake/ServerTask.html).  
+This localhost functionality is driven using the [Selenium Rake Server Task](http://selenium.googlecode.com/svn/trunk/docs/api/rb/Selenium/Rake/ServerTask.html).
 
 ### Finish
 The finish command issues a quit command to the driver and stops the local server if your host is set to "localhost".
 
 ### Support
-- [Firefox](https://github.com/arrgyle/selenium-connect/blob/develop/spec/acceptance/firefox_spec.rb)  
-- [Chrome](https://github.com/arrgyle/selenium-connect/blob/develop/spec/acceptance/chrome_spec.rb)  
-- [Internet Explorer](https://github.com/arrgyle/selenium-connect/blob/develop/spec/acceptance/ie_spec.rb)  
-- [PhantomJS](https://github.com/arrgyle/selenium-connect/blob/develop/spec/acceptance/headless_spec.rb)  
-- [SauceLabs](https://github.com/arrgyle/selenium-connect/blob/develop/spec/acceptance/sauce_spec.rb)  
+- [Firefox](https://github.com/arrgyle/selenium-connect/blob/develop/spec/acceptance/firefox_spec.rb)
+- [Chrome](https://github.com/arrgyle/selenium-connect/blob/develop/spec/acceptance/chrome_spec.rb)
+- [Internet Explorer](https://github.com/arrgyle/selenium-connect/blob/develop/spec/acceptance/ie_spec.rb)
+- [PhantomJS](https://github.com/arrgyle/selenium-connect/blob/develop/spec/acceptance/headless_spec.rb)
+- [SauceLabs](https://github.com/arrgyle/selenium-connect/blob/develop/spec/acceptance/sauce_spec.rb)
 
 ## Contributing
 

data/Rakefile

@@ -1,17 +1,127 @@
-require "bundler/gem_tasks"
+# Encoding: utf-8
+
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-task :default => [:build]
+task default: :build_ci
+
+task build_ci: [:clean, :prepare, :rubocop, :spec_unit]
 
 desc 'Runs standard build activities.'
-task :build => [:clean, :prepare, :spec]
+task build: [:clean, :prepare, :rubocop, :spec_unit, :spec_full]
 
 desc 'Removes the build directory.'
 task :clean do
-  FileUtils.rm_rf('build');
+  FileUtils.rm_rf('build')
 end
 desc 'Adds the build tmp directory for test kit creation.'
 task :prepare do
   FileUtils.mkdir_p('build/tmp')
 end
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec_full)
+
+RSpec::Core::RakeTask.new(:spec_unit) do |t|
+  t.rspec_opts = "--tag ~selenium"
+end
+
+desc 'Runs code quality check'
+task :rubocop do
+  sh 'rubocop'
+end
+
+# TODO This could probably be more cleanly automated
+desc 'Start a release (Requires Git Flow)'
+task :release_start, :version do |t, args|
+  version = args['version']
+
+  # make sure we have the latest stuff
+  system 'git fetch --all'
+
+  # first make sure master is checked out and up to date
+  system 'git checkout master'
+  system 'git pull --no-edit origin master'
+
+  # then make sure develop is up to date
+  system 'git checkout develop'
+  system 'git pull --no-edit origin develop'
+
+  # next assure all the tests run
+  task(:build).invoke
+
+  # start the release process
+  system "git flow release start #{version}"
+
+  # update the version number in the .gemspec file
+  gemspec = File.join(Dir.getwd, 'selenium-connect.gemspec')
+  updated = File.read(gemspec).gsub(
+    /s.version(\s+)=(\s?["|']).+(["|'])/,
+    "s.version\\1=\\2#{version}\\3"
+  )
+  File.open(gemspec, 'w') { |f| f.write(updated) }
+
+  # commit the version bump
+  system 'git add selenium-connect.gemspec'
+  system "git commit -m 'Bumped version to #{version} to prepare for release.'"
+
+  puts "You've started release #{version}, make any last minute updates now.\n"
+end
+
+# TODO This could probablly be more cleanly automated
+desc 'Finish a release (Requires Git Flow and Gem Deploy Permissions'
+task :release_finish, :update_message do |t, args|
+  message   = args['update_message']
+  gemspec   = File.join(Dir.getwd, 'selenium-connect.gemspec')
+  changelog = File.join(Dir.getwd, 'CHANGELOG.md')
+  version   = File.read(gemspec).match(/s.version\s+=\s?["|'](.+)["|']/)[1]
+
+  ### Changelog
+  # get the latest tag
+  last_tag = `git describe --abbrev=0`
+  # get the commit hash since the last that version was merged to develop
+  hash = `git log --grep="Merge branch 'release/#{last_tag.chomp}' into develop" --format="%H"`
+  # get all the commits since them less merges
+  log = `git log --format="- %s" --no-merges #{hash.chomp}..HEAD`
+
+  changelog_contents = File.read(changelog)
+  date = Time.new.strftime('%Y-%m-%d')
+  # create the new heading
+  updated_changelog = "##{version} (#{date})\n" + log + "\n" + changelog_contents
+  # update the contents
+  File.open(changelog, 'w') { |f| f.write(updated_changelog) }
+  puts "Updated change log for version #{version}\n"
+
+  ### Update the gemspec with the message
+  updated_gemspec = File.read(gemspec).gsub(
+    /s.description(\s+)=(\s?["|']).+(["|'])/,
+    "s.description\\1=\\2#{message}\\3"
+  )
+  File.open(gemspec, 'w') { |f| f.write(updated_gemspec) }
+
+  # Commit the updated change log and gemspec
+  system "git commit -am 'Updated CHANGELOG.md and gemspec for #{version} release.'"
+
+  # build the gem
+  system 'gem build selenium-connect.gemspec'
+
+  # push the gem
+  system "gem push selenium-connect-#{version}.gem"
+
+  # remove the gem file
+  system "rm selenium-connect-#{version}.gem"
+
+  # finish the release
+  # TODO there is a bug with git flow, and you still need to deal with merge
+  # messages, might just do this with git directly
+  system "git flow release finish -m'#{version}' #{version}"
+
+  # push develop
+  system 'git push origin develop'
+
+  # push master
+  system 'git push origin master'
+
+  # push tags
+  system 'git push --tags'
+
+  puts "Rock and roll, you just released Selenium Connect #{version}!\n"
+end

data/lib/selenium-connect/configuration.rb

@@ -1,44 +1,40 @@
+# Encoding: utf-8
+
+require 'yaml'
+
 module SeleniumConnect
+  # Encapsulates the configuration
   class Configuration
-    #Selenium Server
+
+    # Selenium Server
     attr_accessor :host, :port, :version,
                   :background, :log, :jar
 
-    #Browsers
+    # Browsers
     attr_accessor :browser, :browser_path,
                   :profile_path, :profile_name
 
-    #SauceLabs
+    # SauceLabs
     attr_accessor :sauce_username, :sauce_api_key,
                   :os, :browser_version, :description
 
-    def config_file=(file)
-      set_config_values_from_file(get_config_values_from_file(file))
-    end
-
-    private
-
     def initialize
-      defaults
+      @host     = 'localhost'
+      @port     = 4444
+      @browser  = 'firefox'
     end
 
-    def defaults
-      @host     = 'localhost' unless host
-      @port     = 4444        unless port
-      @browser  = 'firefox'   unless browser
+    def populate_with_hash(hash)
+      hash.each do |key, value|
+        self.send "#{key}=", value unless value.nil?
+      end
     end
 
-    def get_config_values_from_file(file)
-      require 'yaml'
-      YAML.load_file(file)
+    def populate_with_yaml(file)
+        populate_with_hash YAML.load_file file
     end
 
-    def set_config_values_from_file(config_file_values)
-      config_file_values.each do |config_parameter, config_value|
-        instance_variable_set("@#{config_parameter}", config_value)
-      end
-      defaults
-    end
+    alias_method :config_file=, :populate_with_yaml
 
-  end #Configuration
-end #SeleniumConnect
+  end # Configuration
+end # SeleniumConnect

data/lib/selenium-connect/runner.rb

@@ -1,3 +1,5 @@
+# Encoding: utf-8
+
 require 'selenium-connect/runners/firefox'
 require 'selenium-connect/runners/ie'
 require 'selenium-connect/runners/chrome'
@@ -6,6 +8,7 @@ require 'selenium-connect/runners/no_browser'
 require 'selenium-connect/runners/saucelabs'
 
 module SeleniumConnect
+  # Initializes the driver
   class Runner
     attr_reader :driver, :config
 
@@ -26,13 +29,14 @@ module SeleniumConnect
       else
         Selenium::WebDriver.for(
           :remote,
-          :url => set_server_url,
-          :desired_capabilities => get_browser)
+          url: set_server_url,
+          desired_capabilities: get_browser
+        )
       end
     end
 
     def get_browser
-      browser = browsers.find { |browser| browser.match? }
+      browser = browsers.find { |found_browser| found_browser.match? }
       browser.launch
     end
 
@@ -42,9 +46,8 @@ module SeleniumConnect
       chrome      = Chrome.new(config)
       phantomjs   = PhantomJS.new(config)
       no_browser  = NoBrowser.new(config)
-
-      browsers = [ firefox, ie, chrome, phantomjs, no_browser ]
+      [firefox, ie, chrome, phantomjs, no_browser]
     end
 
-  end #Runner
-end #SeleniumConnect
+  end # Runner
+end # SeleniumConnect

data/lib/selenium-connect/runners/chrome.rb

@@ -1,5 +1,9 @@
+# Encoding: utf-8
+
 module SeleniumConnect
+  # Runner
   class Runner
+    # Chrome browser runner
     class Chrome
       attr_reader :config
 
@@ -8,7 +12,7 @@ module SeleniumConnect
       end
 
       def match?
-        config.browser == "chrome"
+        config.browser == 'chrome'
       end
 
       def launch
@@ -21,6 +25,6 @@ module SeleniumConnect
         config.browser.to_sym
       end
 
-    end #Chrome
-  end #Runner
-end #SeleniumConnect
+    end # Chrome
+  end # Runner
+end # SeleniumConnect

data/lib/selenium-connect/runners/firefox.rb

@@ -1,5 +1,9 @@
+# Encoding: utf-8
+
 module SeleniumConnect
+  # Runner
   class Runner
+    # Firefox browser runner
     class Firefox
       attr_reader :config
 
@@ -8,7 +12,7 @@ module SeleniumConnect
       end
 
       def match?
-        config.browser == "firefox"
+        config.browser == 'firefox'
       end
 
       def launch
@@ -41,6 +45,6 @@ module SeleniumConnect
         config_browser
       end
 
-    end #Firefox
-  end #Runner
-end #SeleniumConnect
+    end # Firefox
+  end # Runner
+end # SeleniumConnect

data/lib/selenium-connect/runners/ie.rb

@@ -1,5 +1,9 @@
+# Encoding: utf-8
+
 module SeleniumConnect
+  # Runner
   class Runner
+    # IE Browser Runner
     class InternetExplorer
       attr_reader :config
 
@@ -8,7 +12,7 @@ module SeleniumConnect
       end
 
       def match?
-        config.browser == "ie"
+        config.browser == 'ie'
       end
 
       def launch
@@ -21,6 +25,6 @@ module SeleniumConnect
         config.browser.to_sym
       end
 
-    end #InternetExplorer
-  end #Runner
-end #SeleniumConnect
+    end # InternetExplorer
+  end # Runner
+end # SeleniumConnect

data/lib/selenium-connect/runners/no_browser.rb

@@ -1,5 +1,9 @@
+# Encoding: utf-8
+
 module SeleniumConnect
+  # Runner
   class Runner
+    # No Browser Runner
     class NoBrowser
       attr_reader :config
 
@@ -12,10 +16,10 @@ module SeleniumConnect
       end
 
       def execute
-        puts "Please specify a valid browser."
+        puts 'Please specify a valid browser.'
         exit 1
       end
 
-    end #NoBrowser
-  end #Runner
-end #SeleniumConnect
+    end # NoBrowser
+  end # Runner
+end # SeleniumConnect

data/lib/selenium-connect/runners/phantomjs.rb

@@ -1,5 +1,9 @@
+# Encoding: utf-8
+
 module SeleniumConnect
+  # Runner
   class Runner
+    # PhantomJS browser runner
     class PhantomJS
       attr_reader :config
 
@@ -8,7 +12,7 @@ module SeleniumConnect
       end
 
       def match?
-        config.browser == "phantomjs"
+        config.browser == 'phantomjs'
       end
 
       def launch
@@ -19,7 +23,7 @@ module SeleniumConnect
 
       def get_executable_path
         current_dir_path = File.join(File.dirname(File.expand_path(__FILE__)))
-        current_dir_path + "/../../../bin/phantomjs"
+        current_dir_path + '/../../../bin/phantomjs'
       end
 
       def config_browser
@@ -33,6 +37,6 @@ module SeleniumConnect
         config_browser
       end
 
-    end #Chrome
-  end #Runner
-end #SeleniumConnect
+    end # Chrome
+  end # Runner
+end # SeleniumConnect

data/lib/selenium-connect/runners/saucelabs.rb

@@ -1,7 +1,11 @@
+# Encoding: utf-8
+
 require 'sauce'
 
 module SeleniumConnect
+  # Runner
   class Runner
+    # Sauce runner
     class Saucelabs
       attr_reader :config
 
@@ -23,12 +27,12 @@ module SeleniumConnect
       def init_browser
         get_credentials
         Sauce::Selenium2.new({
-          :os               =>  config.os,
-          :browser          =>  config.browser,
-          :browser_version  =>  config.browser_version,
-          :job_name         =>  config.description })
+          os:                 config.os,
+          browser:            config.browser,
+          browser_version:    config.browser_version,
+          job_name:           config.description })
       end
 
-    end #Saucelabs
-  end #Runner
-end #SeleniumConnect
+    end # Saucelabs
+  end # Runner
+end # SeleniumConnect

data/lib/selenium-connect/server.rb

@@ -1,4 +1,7 @@
+# Encoding: utf-8
+
 module SeleniumConnect
+  # Creates a server connection
   class Server
     attr_reader :configuration, :current_dir_path
 
@@ -8,15 +11,15 @@ module SeleniumConnect
     end
 
     def start
-      rake "start"
+      rake 'start'
     end
 
     def stop
-      rake "stop"
+      rake 'stop'
     end
 
     def restart
-      rake "restart"
+      rake 'restart'
     end
 
     private
@@ -61,5 +64,5 @@ module SeleniumConnect
       system "rake -f #{get_rake_file} server:#{task}"
     end
 
-  end #Server
-end #SeleniumConnect
+  end # Server
+end # SeleniumConnect

data/lib/selenium-connect.rb

@@ -1,8 +1,11 @@
+# Encoding: utf-8
+
 require 'selenium-webdriver'
 require 'selenium-connect/configuration'
 require 'selenium-connect/runner'
 require 'selenium-connect/server'
 
+# Selenium Connect main module
 module SeleniumConnect
 
   extend self
@@ -35,12 +38,14 @@ module SeleniumConnect
   def finish
     begin
       driver.quit
+    # rubocop:disable HandleExceptions
     rescue Selenium::WebDriver::Error::WebDriverError
-      #no-op
+      # rubocop:enable HandleExceptions
+      # no-op
     end
-    if localhost? then server.stop end
+    server.stop unless localhost?
   end
 
-  alias :start :run
-  alias :stop :finish
+  alias_method :start, :run
+  alias_method :stop, :finish
 end

data/selenium-connect.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name          = 'selenium-connect'
-  s.version       = '2.0.0'
+  s.version       = '2.1.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 the latest selenium server jar to the gem, updated documentation, and fixed a performance issue when running against localhost.'
+  s.description   = 'Updated configuration methods and improved code quality.'
   s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($/)
@@ -19,5 +19,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'sauce', '~> 2.4.4'
 
   s.add_development_dependency 'rspec'
+  s.add_development_dependency "rubocop", "~> 0.9.0"
 
 end

data/spec/acceptance/chrome_spec.rb

@@ -1,18 +1,20 @@
+# Encoding: utf-8
+
 require 'selenium-connect'
 require_relative 'helper'
 
-describe "Chrome" do
+describe 'Chrome', selenium: true do
 
   let(:google)  { Google.new(SeleniumConnect.start) }
   let(:quit)    { SeleniumConnect.finish }
 
-  it "localhost" do
-    #currently only works on Mac
+  it 'localhost' do
+    # currently only works on Mac
     SeleniumConnect.configure do |c|
       c.browser = 'chrome'
     end
     google.visit
-    google.page_title.should include("Google")
+    google.page_title.should include('Google')
     quit
   end
 

data/spec/acceptance/firefox_spec.rb

@@ -1,59 +1,61 @@
+# Encoding: utf-8
+
 require 'selenium-connect'
 require_relative 'helper'
 
-describe "Firefox" do
+describe 'Firefox', selenium: true do
 
   let(:google)  { Google.new(SeleniumConnect.start) }
   let(:quit)    { SeleniumConnect.finish }
 
-  it "blank config" do
-    SeleniumConnect.configure do end
+  it 'blank config' do
+    SeleniumConnect.configure {}
     google.visit
-    google.page_title.should include("Google")
+    google.page_title.should include('Google')
     quit
   end
 
-  it "localhost" do
+  it 'localhost' do
     SeleniumConnect.configure do |c|
-      c.host  = "localhost"
+      c.host  = 'localhost'
     end
     google.visit
-    google.page_title.should include("Google")
+    google.page_title.should include('Google')
     quit
   end
 
-  it "local jar file specified" do
+  it 'local jar file specified' do
     SeleniumConnect.configure do |c|
-      c.host  = "localhost"
+      c.host  = 'localhost'
       c.jar   = "#{Dir.pwd}/bin/selenium-server-standalone-2.33.0.jar"
     end
     google.visit
-    google.page_title.should include("Google")
+    google.page_title.should include('Google')
     quit
   end
 
-  it "profile name" do
-    pending "requires machine setup to run, and need a public example"
+  it 'profile name' do
+    pending 'requires machine setup to run, and need a public example'
     SeleniumConnect.configure do |c|
-      c.profile_name  = "YourProfileNameGoesHere"
+      c.profile_name  = 'YourProfileNameGoesHere'
     end
   end
 
-  it "profile path" do
-    pending "need to add a profile to the repo"
+  it 'profile path' do
+    pending 'need to add a profile to the repo'
     SeleniumConnect.configure do |c|
       c.profile_path  = "#{Dir.pwd}/path/to/profile"
     end
   end
 
-  it "browser path" do
-    #example only works on Mac
+  it 'browser path' do
+    # example only works on Mac
     SeleniumConnect.configure do |c|
-      c.browser = "firefox"
-      c.browser_path = "/Applications/Firefox.app/Contents/MacOS/firefox"
+      c.browser = 'firefox'
+      c.browser_path = '/Applications/Firefox.app/Contents/MacOS/firefox'
     end
     google.visit
-    google.page_title.should include("Google")
+    google.page_title.should include('Google')
     quit
   end
 

data/spec/acceptance/headless_spec.rb

@@ -1,26 +1,28 @@
+# Encoding: utf-8
+
 require 'selenium-connect'
 require_relative 'helper'
 
-describe "Headless" do
+describe 'Headless', selenium: true do
 
   let(:google)  { Google.new(SeleniumConnect.start) }
   let(:quit)    { SeleniumConnect.finish }
 
-  it "should run a basic test with phantom js" do
+  it 'should run a basic test with phantom js' do
     SeleniumConnect.configure do |c|
-      c.browser = "phantomjs"
+      c.browser = 'phantomjs'
     end
     google.visit
-    google.page_title.should include("Google")
+    google.page_title.should include('Google')
     quit
   end
 
-  it "should not find something on a page" do
+  it 'should not find something on a page' do
     SeleniumConnect.configure do |c|
-      c.browser = "phantomjs"
+      c.browser = 'phantomjs'
     end
     google.visit
-    google.page_title.should_not include("Poogle")
+    google.page_title.should_not include('Poogle')
     quit
   end
 

data/spec/acceptance/helper.rb

@@ -1,3 +1,5 @@
+# Encoding: utf-8
+
 class Google
   attr_accessor :page
 
@@ -6,7 +8,7 @@ class Google
   end
 
   def visit
-    page.get "http://www.google.com"
+    page.get 'http://www.google.com'
   end
 
   def page_title

data/spec/acceptance/ie_spec.rb

@@ -1,16 +1,18 @@
+# Encoding: utf-8
+
 require 'selenium-connect'
 require_relative 'helper'
 
-describe "IE" do
+describe 'IE', selenium: true do
 
   let(:google)  { Google.new(SeleniumConnect.start) }
   let(:quit)    { SeleniumConnect.finish }
 
-  it "with Selenium Grid" do
+  it 'with Selenium Grid' do
     pending
     SeleniumConnect.configure do |c|
-      c.host = "192.168.1.139"
-      c.browser = "ie"
+      c.host = '192.168.1.139'
+      c.browser = 'ie'
     end
     driver.get 'https://mashup.ic.mantech.com/ispace'
     quit

data/spec/acceptance/logging_spec.rb

@@ -1,7 +1,9 @@
+# Encoding: utf-8
+
 require 'selenium-connect'
 require_relative 'helper'
 
-describe "Logging" do
+describe 'Logging', selenium: true do
 
   before(:all) do
     @log_dir = 'build'
@@ -14,13 +16,13 @@ describe "Logging" do
     SeleniumConnect.finish
   end
 
-  it "server" do
-    server_log = File.read(@log_dir+'/server.log')
+  it 'server' do
+    server_log = File.read(@log_dir + '/server.log')
     server_log.empty?.should be false
   end
 
-  it "browser" do
-    browser_log = File.read(@log_dir+'/firefox.log')
+  it 'browser' do
+    browser_log = File.read(@log_dir + '/firefox.log')
     browser_log.empty?.should be false
   end
 end

data/spec/acceptance/sauce_spec.rb

@@ -1,6 +1,8 @@
+# Encoding: utf-8
+
 require 'selenium-connect'
 
-describe "Sauce Labs" do
+describe 'Sauce Labs', selenium: true do
 
   it 'hello world' do
     SeleniumConnect.configure do |c|

data/spec/configuration_spec.rb

@@ -0,0 +1,42 @@
+# Encoding: utf-8
+
+require 'selenium-connect/configuration'
+
+describe SeleniumConnect::Configuration do
+
+  VALID_JAR = 'test.jar'
+  VALID_HOST = '111.000.111.000'
+  VALID_SAUCE_USERNAME = 'test_user_name'
+
+  before :each do
+    @configuration = SeleniumConnect::Configuration.new
+  end
+
+  it 'can be populated by a hash' do
+    @configuration.populate_with_hash jar: VALID_JAR, host: VALID_HOST
+    @configuration.jar.should eq VALID_JAR
+    @configuration.host.should eq VALID_HOST
+  end
+
+  it 'can be populated with a yaml file' do
+    @configuration.populate_with_yaml "#{Dir.pwd}/spec/example.yaml"
+    @configuration.sauce_username.should eq VALID_SAUCE_USERNAME
+  end
+
+  it 'supports the config_file= method' do
+    @configuration.config_file= "#{Dir.pwd}/spec/example.yaml"
+    @configuration.sauce_username.should eq VALID_SAUCE_USERNAME
+  end
+
+  it 'should throw an exception for unsupported config variable' do
+    expect do
+      @configuration.hash = { bad: 'config-value' }
+    end.to raise_error NoMethodError
+  end
+
+  it 'sensible defaults persist when nothing is set' do
+    @configuration.host.should eq     'localhost'
+    @configuration.port.should eq     4444
+    @configuration.browser.should eq  'firefox'
+  end
+end

data/spec/example.yaml

@@ -1,23 +1,23 @@
-#Setup & Debugging
+# Setup & Debugging
 jar:
 log:
 
 
-#Where to run your tests
+# Where to run your tests
 host: 'localhost'
 port:
 
 
-#Browser
+# Browser
 browser:      'firefox'
 browser_path:
 profile_path:
 profile_name:
 
 
-#Saucelabs
+# Saucelabs
 os:
-sauce_username:
+sauce_username: 'test_user_name'
 sauce_api_key:
 browser_version:
 description:

data/spec/quit_and_finish_spec.rb

@@ -1,9 +1,11 @@
+# Encoding: utf-8
+
 require 'selenium-connect'
 
-describe "Quit and Finish" do
+describe 'Quit and Finish', selenium: true do
 
-  it "quit when already finished doesn't blow up" do
-    SeleniumConnect.configure do |c| end
+  it 'quit when already finished doesn\'t blow up' do
+    SeleniumConnect.configure {}
     @driver = SeleniumConnect.start
     @driver.quit
     SeleniumConnect.finish

data/spec/runners/phantomjs_spec.rb

@@ -1,23 +1,25 @@
+# Encoding: utf-8
+
 require 'selenium-connect/configuration'
 require 'selenium-connect/runners/phantomjs'
 require 'selenium-webdriver'
 
-describe "phantomjs runner" do
-  it "should match against phantomjs if configured as such" do
+describe 'phantomjs runner', selenium: true do
+  it 'should match against phantomjs if configured as such' do
     config = SeleniumConnect::Configuration.new
     config.browser = 'phantomjs'
     runner = SeleniumConnect::Runner::PhantomJS.new(config)
     runner.match?.should be_true
   end
 
-  it "should not match if there is a different browser specified" do
+  it 'should not match if there is a different browser specified' do
     config = SeleniumConnect::Configuration.new
     config.browser = 'chrome'
     runner = SeleniumConnect::Runner::PhantomJS.new(config)
     runner.match?.should be_false
   end
 
-  it "should return a browser capabilities object for the browser on launch" do
+  it 'should return a browser capabilities object for the browser on launch' do
     config = SeleniumConnect::Configuration.new
     config.browser = 'phantomjs'
     runner = SeleniumConnect::Runner::PhantomJS.new(config)

data/spec/yaml_spec.rb

@@ -1,17 +1,46 @@
+# Encoding: utf-8
+
 require 'selenium-connect'
 
-describe "YAML" do
+describe 'YAML' do
 
   it 'setting config_file returns a proper config object' do
     SeleniumConnect.configure do |c|
       c.config_file = "#{Dir.pwd}/spec/example.yaml"
     end
     config = SeleniumConnect.debug_config
-    config.class.should == SeleniumConnect::Configuration
-    config.inspect.empty?.should == false
+    config.class.should eq SeleniumConnect::Configuration
+    config.inspect.empty?.should be_false
+  end
+
+  it 'chrome', wip: true, selenium: true do
+    SeleniumConnect.configure do |c|
+      c.config_file = "#{Dir.pwd}/spec/example.yaml"
+    end
+    driver = SeleniumConnect.start
+    driver.get 'http://google.com'
+    SeleniumConnect.finish
+  end
+
+  it 'chrome', wip: true, selenium: true do
+    SeleniumConnect.configure do |c|
+      c.config_file = "#{Dir.pwd}/spec/example.yaml"
+    end
+    driver = SeleniumConnect.start
+    driver.get 'http://google.com'
+    SeleniumConnect.finish
+  end
+
+  it 'chrome', wip: true, selenium: true do
+    SeleniumConnect.configure do |c|
+      c.config_file = "#{Dir.pwd}/spec/example.yaml"
+    end
+    driver = SeleniumConnect.start
+    driver.get 'http://google.com'
+    SeleniumConnect.finish
   end
 
-  it 'chrome', :wip => true do
+  it 'chrome', wip: true, selenium: true do
     SeleniumConnect.configure do |c|
       c.config_file = "#{Dir.pwd}/spec/example.yaml"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-connect
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -76,8 +76,23 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Added the latest selenium server jar to the gem, updated documentation,
-  and fixed a performance issue when running against localhost.
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+description: Updated configuration methods and improved code quality.
 email:
 - dave@arrgyle.com
 - jason@arrgyle.com
@@ -86,8 +101,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -113,6 +130,7 @@ files:
 - spec/acceptance/ie_spec.rb
 - spec/acceptance/logging_spec.rb
 - spec/acceptance/sauce_spec.rb
+- spec/configuration_spec.rb
 - spec/example.yaml
 - spec/quit_and_finish_spec.rb
 - spec/runners/phantomjs_spec.rb
@@ -136,6 +154,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2242765007989864300
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25