Fixed cucumber step to overwrite existing files. Updated .gitignore a…

…nd travis.yml
midwire · Aug 14, 2011 · 6053704 · 6053704
1 parent ca5b62f
commit 6053704
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,6 @@
 .bundle
 Gemfile.lock
 pkg/*
-tmp/*
+tmp/*
+vendor/bundle
+lib/generators/generators
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,9 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+gemfile:
+  - gemfiles/Gemfile.rails-2.3.x
+  - gemfiles/Gemfile.rails-3.0.x
+env:
+  - ISOLATED=true
+  - ISOLATED=false
diff --git a/features/step_definitions/rails_setup_steps.rb b/features/step_definitions/rails_setup_steps.rb
@@ -9,8 +9,8 @@
 Given %{a new migrated Rails app} do
   # Don't delete the rails app
   FileUtils.mkdir_p("tmp")
-  system("rails new tmp/rails_app").should be_true
-  system("ln -s ../../../lib/generators tmp/rails_app/lib/generators").should be_true
+  system("rails new tmp/rails_app -f").should be_true
+  system("ln -sf ../../../lib/generators tmp/rails_app/lib/generators").should be_true
   @current_directory = File.expand_path("tmp/rails_app")
   When %{I run "rails g my_zipcode_gem:models"}
   Then %{I should successfully run "rake db:migrate"}