Skip to content

Commit

Permalink
Merge branch 'rails3'
Browse files Browse the repository at this point in the history
  • Loading branch information
timcharper committed Sep 12, 2010
2 parents 3da3668 + 0106dcf commit 9421aac
Show file tree
Hide file tree
Showing 30 changed files with 358 additions and 383 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source :gemcutter
gem 'cucumber', '0.7.3'
gem 'gherkin', '1.0.27'
gem 'rspec', '1.3.0'
gem "rspec", "2.0.0.beta.20"
gem 'rake'
gem 'ruby-debug'
95 changes: 42 additions & 53 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,53 +1,42 @@
---
dependencies:
ruby-debug:
group:
- :default
version: ">= 0"
rake:
group:
- :default
version: ">= 0"
rspec:
group:
- :default
version: = 1.3.0
gherkin:
group:
- :default
version: = 1.0.27
cucumber:
group:
- :default
version: = 0.7.3
specs:
- rake:
version: 0.8.7
- builder:
version: 2.1.2
- columnize:
version: 0.3.1
- diff-lcs:
version: 1.1.2
- trollop:
version: 1.16.2
- gherkin:
version: 1.0.27
- json_pure:
version: 1.4.3
- term-ansicolor:
version: 1.0.5
- cucumber:
version: 0.7.3
- linecache:
version: "0.43"
- rspec:
version: 1.3.0
- ruby-debug-base:
version: 0.10.3
- ruby-debug:
version: 0.10.3
hash: c24e72c551f001f4324870a5572c500748ab2ee2
sources:
- Rubygems:
uri: http://gemcutter.org
GEM
remote: http://rubygems.org/
specs:
builder (2.1.2)
columnize (0.3.1)
cucumber (0.7.3)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (>= 1.0.27)
json_pure (>= 1.2.4)
term-ansicolor (>= 1.0.4)
diff-lcs (1.1.2)
gherkin (1.0.27)
trollop (>= 1.16.2)
json_pure (1.4.6)
linecache (0.43)
rake (0.8.7)
rspec (2.0.0.beta.20)
rspec-core (= 2.0.0.beta.20)
rspec-expectations (= 2.0.0.beta.20)
rspec-mocks (= 2.0.0.beta.20)
rspec-core (2.0.0.beta.20)
rspec-expectations (2.0.0.beta.20)
diff-lcs (>= 1.1.2)
rspec-mocks (2.0.0.beta.20)
ruby-debug (0.10.3)
columnize (>= 0.1)
ruby-debug-base (~> 0.10.3.0)
ruby-debug-base (0.10.3)
linecache (>= 0.3)
term-ansicolor (1.0.5)
trollop (1.16.2)

PLATFORMS
ruby

DEPENDENCIES
cucumber (= 0.7.3)
gherkin (= 1.0.27)
rake
rspec (= 2.0.0.beta.20)
ruby-debug
6 changes: 6 additions & 0 deletions History.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
== 0.9.0 RC ==

* Rails 3.0 compatibility. (not backwards compatible, right now. For rails 2.x, use spork 0.8.x)

(TODO: extract rails framework support into rspec-rails. They really should be separate.)

== 0.8.4

* Add adapter for Padrino (Elliot Winkler)
Expand Down
34 changes: 14 additions & 20 deletions README.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@ And more to come! Vote for your favorite at http://github.com/timcharper/spork/

== Supported Application Frameworks

Actually, Spork ~can~ work with any application framework. But, it ships with hooks and helpers to help make the experience much more "out of the box"
Actually, Spork ~can~ work with any application framework. But, it ships with hooks and helpers to make an "out of the box" experience.

* Rails

More can be added! Vote for your favorite at http://github.com/timcharper/spork/issues
* Rails 3.0 (for Rails 2.{1,2,3}.x, please try spork 0.8.x)
* Padrino

== INSTALL:

=== rubygems:

[sudo] gem install spork

alternatively:
=== bundler:

Add to your Gemfile:

git clone git://github.com/timcharper/spork.git
cd spork
gem build spork.gemspec
sudo gem install spork.gemspec
gem "spork"

== Usage

Expand Down Expand Up @@ -80,7 +80,7 @@ To get the TextMate RSpec bundle to use spork, go to config->advanced->shell var

To run from the command line, use:

spec --drb spec/lib/my_spec.rb
rspec --drb spec/lib/my_spec.rb

Or, you could add the following flag to your +spec.opts+ file.

Expand All @@ -104,24 +104,18 @@ If you wish to hack on spork, you will want to run the automated test suite to m

Then, to run the specs:

bundle exec spec spec/
bundle exec rspec spec/

(or, alternatively...)

bundle exec rake

=== running features ===

Basically, like this:
Essentially:

bundle exec cucumber features

If you wish to test with another Gemfile:

GEMFILE=rails2.3 bundle exec cucumber features

Where rails2.3 is one of support/gemfiles/* (rails2.3 is the default)

== Some potential issues and ways to overcome them:

See http://wiki.github.com/timcharper/spork/troubleshooting
Expand All @@ -130,6 +124,6 @@ See http://wiki.github.com/timcharper/spork/troubleshooting

* Ben Mabey - help with documentation, testing, suggestions, patches, and bringing Cucumber support.
* David Chelimsky - for the fine RSpec testing framework, and the original rspec-rails spec_server implementation, which Spork has built upon.
* Lead Media Partners - just for being an awesome place to work.
* LeadTune - just for being an awesome place to work.

Spork (c) 2009 Tim Harper, released under the MIT license
Spork (c) 2010 Tim Harper, released under the MIT license
4 changes: 0 additions & 4 deletions TESTED_RAILS_VERSIONS.txt

This file was deleted.

5 changes: 3 additions & 2 deletions features/at_exit_during_each_run.feature
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Feature: At exit during each run
Given a file named "spec/spec_helper.rb" with:
"""
require 'rubygems'
require 'spec'
require 'rspec'
Spork.prefork do
puts "loading"
at_exit { puts "prefork at_exit called" }
Expand All @@ -23,13 +23,14 @@ Feature: At exit during each run

And a file named "spec/did_it_work_spec.rb" with:
"""
require 'spec_helper'
describe "Did it work?" do
it "checks to see if all worked" do
puts "ran specs"
end
end
"""
When I fire up a spork instance with "spork rspec"
And I run spec --drb spec/did_it_work_spec.rb
And I run rspec --drb spec/did_it_work_spec.rb
Then the output should contain "second first"
Then the output should not contain "prefork at_exit called"
2 changes: 1 addition & 1 deletion features/cucumber_rails_integration.feature
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Feature: Cucumber integration with rails
require 'cucumber'
require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support
require 'spec/rails'
require 'rspec/rails'
require 'cucumber/rails/rspec'
#### this is for this test only #######
Expand Down
95 changes: 0 additions & 95 deletions features/gemfiles/rails2.3/Gemfile.lock

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source :gemcutter
gem 'sqlite3-ruby', '1.2.5'
gem 'cucumber', '0.7.3'
gem 'cucumber-rails'
gem 'gherkin', '1.0.27'
gem 'rspec', '1.3.0'
gem 'rspec-rails', '>= 1.3.2'
gem 'rails', '2.3.8'
gem 'cucumber-rails', '0.3.1'
gem "gherkin", "1.0.30"
gem "rspec", "2.0.0.beta.20"
gem 'rspec-rails', "2.0.0.beta.20"
gem 'rails', '3.0.0'
gem 'ruby-debug', '>= 0.10.3'
gem 'spork', :path => File.expand_path("../../..", File.dirname(__FILE__))
gem 'spork', :path => File.expand_path("../../..", File.dirname(__FILE__))
Loading

0 comments on commit 9421aac

Please sign in to comment.