chemistrykit 2.1.0 → 3.0.0

data/.rubocop.yml

@@ -0,0 +1,5 @@
+LineLength:
+  Enabled: false
+
+MethodLength:
+  Max: 30

data/.ruby-version

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

data/.travis.yml

@@ -1,9 +1,5 @@
 language: ruby
 rvm:
   - 1.9.3
-branches:
-  only:
-    - master
-    - develop
 notifications:
   hipchat: 2a07784c1aeed1b6efa332242d3fc3@Regulation Station

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+#3.0.0 (2013-07-04)
+Now with concurrent tests
+
+- Bumped version to 3.0.0 to prepare for release.
+- included message into changelog update and added a test for specific concurrency feature
+- integrated config driven concurrency, cleaned up some tests
+- abstracted out config loading into brew
+- learning how to spell concurrency correctly
+- fixed a minor typo in a feature and added a todo comment
+- updated feature files to have correct directory, added a test for concurency
+- upgraded the global config into the shared context
+- updated all tests to match new configuration format
+- added back updated configuration object
+- removed local references to selenium server and updated tests accordingly
+- updated to latest build of selenium connect, fixed a small bug in a feature file, and updated the rakefile to handle find tags correctly
+- Code quality fixes
+- Wired up --processes to adjust number of processes when running --parallel, defaulting the number to 5
+- Updated comment
+- Updated sauce brew scenario to use our sauce account
+- Test group execution working
+- Renamed parallel to parallel_tests_mods for better explicitness. Got ckit brew running with parallel_tests (WOOT!). Now just need to figure out how to execute tests within a group for each thread rather than all tests in each thread.
+- removed branch restriction on travis so all feature branches would be tested
+- Fixed all code quality issues, added custom options file to tweek method length and line length cops, updated build system
+- added rubocop to the build process
+- Added a monkey patch for parallel_tests' RSpec runner to override its defaults with ours and wired it up in the parallel execution hook. It runs but gives an argument error from ckit. Also, took a first crack at setting the base_url via config.yaml and the shared_context
+- Added parallel_tests and parallel to repo. Wired up a command argument for ckit brew (--parallel) to execute the wip progess concurrency method.
+- Downgraded the required ruby version to just 1.9.3
+- one small edit because of a bug with git flow #62
+
 #2.1.0 (2013-06-28)
 - Updated documentation for #62 release process.
 - Bumped version to 2.1.0 to prepare for release.

data/Rakefile

@@ -1,15 +1,17 @@
-require "bundler/gem_tasks"
-require "cucumber"
-require "cucumber/rake/task"
+# Encoding: utf-8
+
+require 'bundler/gem_tasks'
+require 'cucumber'
+require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 
-task :default => [:build_ci]
+task default: :build_ci
 
 desc 'Runs standard build activities.'
-task :build => [:clean, :prepare, :spec, :cucumber]
+task build: [:clean, :prepare, :rubocop, :spec, :cucumber]
 
 desc 'Runs standard build activities for ci server.'
-task :build_ci => [:clean, :prepare, :spec]
+task build_ci: [:clean, :prepare, :rubocop, :spec]
 
 desc 'Removes the build directory.'
 task :clean do
@@ -24,44 +26,49 @@ RSpec::Core::RakeTask.new(:spec)
 
 Cucumber::Rake::Task.new(:cucumber)
 
+desc 'Runs code quality check'
+task :rubocop do
+  sh 'rubocop'
+end
 
-#TODO This could probablly be more cleanly automated
+# 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"
+  # 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"
+  # 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"
+  # 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
+  # next assure all the tests run
   task(:build).invoke
 
-  #start the release process
+  # start the release process
   system "git flow release start #{version}"
 
-  #update the version number in the .gemspec file
+  # update the version number in the .gemspec file
   gemspec = File.join(Dir.getwd, 'chemistrykit.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 chemistrykit.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 chemistrykit.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
+# 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']
@@ -69,51 +76,57 @@ task :release_finish, :update_message do |t, args|
   changelog = File.join(Dir.getwd, 'CHANGELOG.md')
   version   = File.read(gemspec).match(/s.version\s+=\s?["|'](.+)["|']/)[1]
 
-  ###Changelog
-  #get the latest tag
+  ### Changelog
+  # get the latest tag
+  system 'git checkout master'
   last_tag = `git describe --abbrev=0`
-  #get the commit hash since the last that version was merged to develop
+  system "git checkout release/#{version}"
+
+  # 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
+  # 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) }
+  date = Time.new.strftime('%Y-%m-%d')
+  # create the new heading
+  updated_changelog = "##{version} (#{date})\n" + message + "\n\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) }
+  ### 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
+  # 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 chemistrykit.gemspec"
+  # build the gem
+  system 'gem build chemistrykit.gemspec'
 
-  #push the gem
+  # push the gem
   system "gem push chemistrykit-#{version}.gem"
 
-  #remove the gem file
+  # remove the gem file
   system "rm chemistrykit-#{version}.gem"
 
-  #finish the release
-  system "git flow release finish -m '#{message}' #{version}"
+  # 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 develop
+  system 'git push origin develop'
 
-  #push master
-  system "git push origin master"
+  # push master
+  system 'git push origin master'
 
-  #push tags
-  system "git push --tags"
+  # push tags
+  system 'git push --tags'
 
   puts "Rock and roll, you just released ChemistryKit #{version}!\n"
 end

data/bin/ckit

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
+# Encoding: utf-8
+
 require 'chemistrykit'
 
 # Had difficulties getting Thor to return a proper exit status on failure
 # Will need to revisit
 ckit_result = ChemistryKit::CLI::CKitCLI.start
-ckit_result.kind_of?(Integer)? exit(ckit_result): exit(0)
+ckit_result.kind_of?(Integer) ? exit(ckit_result) : exit(0)

data/chemistrykit.gemspec

@@ -1,12 +1,14 @@
+# Encoding: utf-8
+
 Gem::Specification.new do |s|
   s.name          = "chemistrykit"
-  s.version       = "2.1.0"
+  s.version       = "3.0.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/chemistrykit"
   s.summary       = "A simple and opinionated web testing framework for Selenium that follows convention over configuration."
-  s.description   = "Automated build process"
+  s.description   = "Now with concurrent tests"
   s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($/)
@@ -22,10 +24,13 @@ Gem::Specification.new do |s|
   s.add_dependency "selenium-webdriver", "~> 2.29.0"
   s.add_dependency "ci_reporter", "~> 1.8.3"
   s.add_dependency "rest-client", "~> 1.6.7"
-  s.add_dependency "selenium-connect", "~> 2.0.0"
+  s.add_dependency "selenium-connect", "~> 2.1.1"
+  s.add_dependency "parallel_tests", "~> 0.15.0"
+  s.add_dependency "parallel", "~> 0.7.0"
 
   s.add_development_dependency "rspec", "~> 2.12.0"
   s.add_development_dependency "aruba", "~> 0.5.1"
   s.add_development_dependency "cucumber", "~> 1.2.1"
   s.add_development_dependency "rake", "~> 10.0.3"
+  s.add_development_dependency "rubocop", "~> 0.9.0"
 end

data/features/brew.feature

@@ -19,7 +19,7 @@ Feature: Brewing a ChemistryKit project
         end
       end
       """
-    And a file named "beaker/bookie_beaker.rb" with:
+    And a file named "beakers/bookie_beaker.rb" with:
       """
       describe "Bookie", :depth => 'shallow' do
         let(:book) { Formulas::Bookie.new(@driver) }
@@ -33,9 +33,9 @@ Feature: Brewing a ChemistryKit project
   Scenario: Localhost
     Given a file named "config.yaml" with:
       """
-      jar: '../../../vendor/selenium-server-standalone-2.33.0.jar'
-      log: 'evidence'
-      host: 'localhost'
+      selenium_connect:
+          log: 'evidence'
+          host: 'localhost'
       """
     When I run `ckit brew`
     Then the stdout should contain "1 example, 0 failures"
@@ -47,14 +47,15 @@ Feature: Brewing a ChemistryKit project
   Scenario: Saucelabs
     Given a file named "config.yaml" with:
       """
-      log: 'evidence'
-      host: 'saucelabs'
-      brower: 'iexplore'
-      os: 'windows 2003'
-      sauce_username: 'dave_arrgyle'
-      sauce_api_key: '58092e14-4e9c-4911-bfc4-a09ecc02db63'
-      browser_version: '8'
-      description: 'ckit feature check'
+      selenium_connect:
+          log: 'evidence'
+          host: 'saucelabs'
+          browser: 'iexplore'
+          os: 'windows 2003'
+          sauce_username: 'testing_arrgyle'
+          sauce_api_key: 'ab7a6e17-16df-42d2-9ef6-c8d2539cc38a'
+          browser_version: '8'
+          description: 'ckit feature check'
       """
     When I run `ckit brew`
     Then the stdout should contain "1 example, 0 failures"
@@ -62,11 +63,11 @@ Feature: Brewing a ChemistryKit project
   Scenario: Brew a single beaker
     Given a file named "config.yaml" with:
       """
-      jar: '../../../vendor/selenium-server-standalone-2.33.0.jar'
-      log: 'evidence'
-      host: 'localhost'
+      selenium_connect:
+          log: 'evidence'
+          host: 'localhost'
       """
-    And a file named "beaker/other_beaker.rb" with:
+    And a file named "beakers/other_beaker.rb" with:
       """
       describe "Other", :depth => 'shallow' do
         let(:book) { Formulas::Bookie.new(@driver) }
@@ -76,6 +77,6 @@ Feature: Brewing a ChemistryKit project
         end
       end
       """
-    When I run `ckit brew --beaker=beaker/other_beaker.rb`
+    When I run `ckit brew --beakers=beakers/other_beaker.rb`
     Then the stdout should contain "1 example, 0 failures"
 

data/features/catalyst.feature

@@ -64,7 +64,7 @@ Catalyst: n. A pocket of data (consumed from a CSV file) used to drive a test th
       end
       """
 
-    And a file named "beaker/google_beaker.rb" with:
+    And a file named "beakers/google_beaker.rb" with:
       """
       describe "Google", :depth => 'shallow' do
         let(:google) { Formulas::Google.new(@driver) }
@@ -80,9 +80,9 @@ Catalyst: n. A pocket of data (consumed from a CSV file) used to drive a test th
 
     And a file named "config.yaml" with:
       """
-      jar: '../../../vendor/selenium-server-standalone-2.33.0.jar'
-      log: 'evidence'
-      host: 'localhost'
+      selenium_connect:
+          log: 'evidence'
+          host: 'localhost'
       """
     When I run `ckit brew`
     Then the stdout should contain "1 example, 0 failures"

data/features/concurrency.feature

@@ -0,0 +1,61 @@
+Feature: Support for concurency
+  In order to run the tests quickly
+  As a chemistry kit harness developer
+  I want to run them in parallel
+
+  Background:
+    Given I run `ckit new concurrency-test`
+    And I cd to "concurrency-test"
+    And a file named "beakers/first_beaker.rb" with:
+    """
+    describe "Cheese", :depth => 'shallow' do
+      it "loads an external web page" do
+        @driver.get "http://www.google.com"
+        @driver.title.should include("Google")
+      end
+      it "loads an external web page" do
+        @driver.get "http://www.google.com"
+        @driver.title.should include("Google")
+      end
+    end
+    """
+    And a file named "beakers/second_beaker.rb" with:
+    """
+    describe "Cheese 2", :depth => 'shallow' do
+      it "loads an external web page" do
+        @driver.get "http://www.google.com"
+        @driver.title.should include("Google")
+      end
+    end
+    """
+  Scenario: I can run the tests in parallel
+    When I overwrite config.yaml with:
+      """
+      concurrency: 4
+      selenium_connect:
+          log: 'evidence'
+          host: 'saucelabs'
+          browser: 'firefox'
+          sauce_username: 'testing_arrgyle'
+          sauce_api_key: 'ab7a6e17-16df-42d2-9ef6-c8d2539cc38a'
+          description: 'concurrency check'
+      """
+    When I run `ckit brew`
+    Then the stdout should contain "4 processes for 2 beakers"
+    And the stdout should contain "3 examples, 0 failures"
+
+  Scenario: I can run a specific beaker in parallel
+    When I overwrite config.yaml with:
+      """
+      concurrency: 4
+      selenium_connect:
+          log: 'evidence'
+          host: 'saucelabs'
+          browser: 'firefox'
+          sauce_username: 'testing_arrgyle'
+          sauce_api_key: 'ab7a6e17-16df-42d2-9ef6-c8d2539cc38a'
+          description: 'concurrency check'
+      """
+      When I run `ckit brew --beakers=beakers/first_beaker.rb`
+      Then the stdout should contain "4 processes for 1 beakers"
+      And the stdout should contain "2 examples, 0 failures"

data/features/exit_status.feature

@@ -5,13 +5,13 @@ Feature: Exit Status
     And I cd to "cheese"
     And a file named "config.yaml" with:
       """
-      jar: '../../../vendor/selenium-server-standalone-2.33.0.jar'
-      log: 'evidence'
-      host: 'localhost'
+      selenium_connect:
+          log: 'evidence'
+          host: 'localhost'
       """
 
   Scenario: Passing
-    And a file named "beaker/test_beaker.rb" with:
+    And a file named "beakers/test_beaker.rb" with:
     """
     describe "Cheese", :depth => 'shallow' do
       it "loads an external web page" do
@@ -24,7 +24,7 @@ Feature: Exit Status
     Then the exit code should be 0
 
   Scenario: Failing
-    And a file named "beaker/test_beaker.rb" with:
+    And a file named "beakers/test_beaker.rb" with:
     """
     describe "Cheese", :depth => 'shallow' do
       it "loads an external web page" do