Skip to content

Commit

Permalink
Some clean-up in specs
Browse files Browse the repository at this point in the history
  • Loading branch information
@cavalle
cavalle committed Sep 18, 2010
1 parent 4956708 commit 54c12f3
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 33 deletions.
2 changes: 1 addition & 1 deletion spec/acceptance/rspec-1/acceptance_helper.rb
View file
Expand Up @@ -78,7 +78,7 @@ def steak_dir
Gemfile
end
Dir.chdir current_dir do
`rvm gemset create steak-rspec-1`
run "rvm gemset create steak-rspec-1"
run "gem install bundler --pre"
run "bundle install"
end
Expand Down
8 changes: 4 additions & 4 deletions spec/acceptance/rspec-1/acceptance_spec_generator_spec.rb
View file
Expand Up @@ -12,31 +12,31 @@

scenario "Adding new acceptance spec" do
Dir.chdir @rails_app do
`script/generate acceptance_spec document_creation`
run "script/generate acceptance_spec document_creation"
end

File.exist?(@rails_app + "/spec/acceptance/document_creation_spec.rb").should be_true
end

scenario "Adding new acceptance spec (plural name)" do
Dir.chdir @rails_app do
`script/generate acceptance_spec creating_documents`
run "script/generate acceptance_spec creating_documents"
end

File.exist?(@rails_app + "/spec/acceptance/creating_documents_spec.rb").should be_true
end

scenario "Adding new acceptance spec (pascalized name)" do
Dir.chdir @rails_app do
`script/generate acceptance_spec DocumentCreation`
run "script/generate acceptance_spec DocumentCreation"
end

File.exist?(@rails_app + "/spec/acceptance/document_creation_spec.rb").should be_true
end

scenario "Adding new acceptance spec (name ending with _spec)" do
Dir.chdir @rails_app do
`script/generate acceptance_spec document_creation_spec`
run "script/generate acceptance_spec document_creation_spec"
end

File.exist?(@rails_app + "/spec/acceptance/document_creation_spec.rb").should be_true
Expand Down
10 changes: 5 additions & 5 deletions spec/acceptance/rspec-1/steak_generator_spec.rb
View file
Expand Up @@ -10,7 +10,7 @@
rails_app = create_rails_app(:setup_steak => false)

Dir.chdir rails_app do
`script/generate steak`
run "script/generate steak"
end

File.exist?(rails_app + "/spec/acceptance/acceptance_helper.rb").should be_true
Expand All @@ -23,7 +23,7 @@
rails_app = create_rails_app(:setup_steak => false)

Dir.chdir rails_app do
`script/generate steak`
run "script/generate steak"
end

spec_file = create_spec :path => rails_app + "/spec/acceptance",
Expand All @@ -44,7 +44,7 @@
rails_app = create_rails_app(:setup_steak => false)

Dir.chdir rails_app do
`script/generate steak --webrat`
run "script/generate steak --webrat"
end

spec_file = create_spec :path => rails_app + "/spec/acceptance",
Expand All @@ -65,7 +65,7 @@
rails_app = create_rails_app

Dir.chdir rails_app do
`script/generate steak`
run "script/generate steak"
run("rake stats").should =~ /Acceptance specs/
end
end
Expand All @@ -84,7 +84,7 @@
SPEC

Dir.chdir rails_app do
run "rake db:create db:migrate db:test:prepare"
run "rake db:migrate db:test:prepare"

output = run "rake spec:acceptance"
output.should =~ /1 example, 0 failures/
Expand Down
20 changes: 13 additions & 7 deletions spec/acceptance/rspec-2/acceptance_helper.rb
View file
Expand Up @@ -17,7 +17,7 @@ def create_spec(options)
def create_rails_app(options = {})
path = File.join(Dir.tmpdir, String.random, "rails_app")
FileUtils.rm_rf path
`rails new #{path}`
run "rails new #{path}"
FileUtils.rm_rf path + '/public/index.html'
File.open(File.join(path, "Gemfile"), "a") do |file|
file.write "\ngem 'rspec-rails', '>= 2.0.0.a9'\n" <<
Expand All @@ -29,19 +29,19 @@ def create_rails_app(options = {})
file.write "\ngem 'steak', :path => '#{File.expand_path(File.dirname(__FILE__) + '/../../..')}'\n"
end

`bundle install`
run "bundle install"

Dir.chdir path do
`rails generate rspec:install`
run "rails generate rspec:install"
if options[:scaffold]
`rails generate scaffold #{options[:scaffold]}`
`rake db:create db:migrate db:test:prepare`
run "rails generate scaffold #{options[:scaffold]}"
run "rake db:migrate db:test:prepare"
end
end

unless options[:setup_steak] == false
Dir.chdir path do
`rails generate steak:install`
run "rails generate steak:install"
end
end

Expand All @@ -51,13 +51,19 @@ def create_rails_app(options = {})
end

module HelperMethods
def run(cmd)
`#{cmd} 2>&1`.tap do |o|
puts o if ENV['TRACE']
end
end

def run_spec(file_path, app_base=nil)
if app_base
current_dir = Dir.pwd
Dir.chdir app_base
end

output = `rspec #{file_path} 2>&1`
output = run("rspec #{file_path}")

Dir.chdir current_dir if app_base
output
Expand Down
16 changes: 8 additions & 8 deletions spec/acceptance/rspec-2/rails_spec.rb
View file
Expand Up @@ -57,8 +57,8 @@
rails_app = create_rails_app

Dir.chdir rails_app do
`rails generate steak:install`
`rake stats`.should =~ /Acceptance specs/
run "rails generate steak:install"
run("rake stats").should =~ /Acceptance specs/
end
end

Expand All @@ -74,14 +74,14 @@
end
end
SPEC

Dir.chdir rails_app do
`rake db:create db:migrate db:test:prepare`

output = `rake spec:acceptance`
run "rake db:migrate db:test:prepare"
output = run("rake spec:acceptance")
output.should =~ /1 example, 0 failures/

output = `rake`
output = run("rake")
output.should =~ /1 example, 0 failures/
end
end
Expand Down
6 changes: 3 additions & 3 deletions spec/acceptance/rspec-2/steak_install_generator_spec.rb
View file
Expand Up @@ -11,7 +11,7 @@
rails_app = create_rails_app(:setup_steak => false)

Dir.chdir rails_app do
`rails generate steak:install`
run "rails generate steak:install"
end

File.exist?(rails_app + "/spec/acceptance/acceptance_helper.rb").should be_true
Expand All @@ -24,7 +24,7 @@
rails_app = create_rails_app(:setup_steak => false, :scaffold => :users)

Dir.chdir rails_app do
`rails generate steak:install`
run "rails generate steak:install"
end

spec_file = create_spec :path => rails_app + "/spec/acceptance",
Expand All @@ -45,7 +45,7 @@
rails_app = create_rails_app(:setup_steak => false, :scaffold => :users)

Dir.chdir rails_app do
`rails generate steak:install --webrat`
run "rails generate steak:install --webrat"
end

spec_file = create_spec :path => rails_app + "/spec/acceptance",
Expand Down
10 changes: 5 additions & 5 deletions spec/acceptance/rspec-2/steak_spec_generator_spec.rb
View file
Expand Up @@ -12,7 +12,7 @@

scenario "Adding new acceptance spec" do
Dir.chdir @rails_app do
`rails generate steak:spec document_creation`
run "rails generate steak:spec document_creation"
end

File.exist?(
Expand All @@ -22,7 +22,7 @@

scenario "Adding new acceptance spec (plural name)" do
Dir.chdir @rails_app do
`rails generate steak:spec creating_documents`
run "rails generate steak:spec creating_documents"
end

File.exist?(
Expand All @@ -32,7 +32,7 @@

scenario "Adding new acceptance spec (pascalized name)" do
Dir.chdir @rails_app do
`rails generate steak:spec DocumentCreation`
run "rails generate steak:spec DocumentCreation"
end

File.exist?(
Expand All @@ -42,7 +42,7 @@

scenario "Adding new acceptance spec (name ending with _spec)" do
Dir.chdir @rails_app do
`rails generate steak:spec document_creation_spec`
run "rails generate steak:spec document_creation_spec"
end

File.exist?(
Expand All @@ -52,7 +52,7 @@

scenario "Adding new acceptance spec (namespaced)" do
Dir.chdir @rails_app do
`rails generate steak:spec document/creation_spec`
run "rails generate steak:spec document/creation_spec"
end

file_path = @rails_app + "/spec/acceptance/document/creation_spec.rb"
Expand Down

0 comments on commit 54c12f3

Please sign in to comment.