Skip to content
This repository has been archived by the owner on Mar 26, 2023. It is now read-only.

Commit

Permalink
Update rails test to work with Rails 3.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
pbm committed Sep 2, 2011
1 parent f2217e1 commit f52dbdb
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 9 deletions.
2 changes: 2 additions & 0 deletions examples/rails/.gitignore
@@ -1 +1,3 @@
rails rails
Gemfile.lock

5 changes: 5 additions & 0 deletions examples/rails/Gemfile
@@ -0,0 +1,5 @@
source 'http://w2-stdev-ub10-01.gemstone.com:9292'
source 'http://rubygems.org'

gem 'rails', '~>3.1'
gem 'bcrypt-ruby'
4 changes: 2 additions & 2 deletions examples/rails/Rakefile
Expand Up @@ -16,8 +16,8 @@ namespace :patch do
"activesupport-3.0.4" => ['activesupport_class_patch.diff', "activesupport-3.0.4" => ['activesupport_class_patch.diff',
'activesupport_time_zone_patch.diff', 'activesupport_time_zone_patch.diff',
'activesupport_descendents_tracker_patch.diff'], 'activesupport_descendents_tracker_patch.diff'],
"activesupport-3.1.0.rc4" => ['activesupport_class_patch-3.1.diff', "activesupport-3.1.0" => ['activesupport_class_patch-3.1.diff',
'activesupport_time_patch-3.1.diff'] 'activesupport_time_patch-3.1.diff']
} }
apply_patches(patch_info) apply_patches(patch_info)
end end
Expand Down
5 changes: 3 additions & 2 deletions examples/rails/myapp/Gemfile
@@ -1,6 +1,7 @@
source 'http://w2-stdev-ub10-01.gemstone.com:9292'
source 'http://rubygems.org' source 'http://rubygems.org'


gem 'rails', '3.1.0.rc4' gem 'rails', '~>3.1'


# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git' # gem 'rails', :git => 'git://github.com/rails/rails.git'
Expand All @@ -9,7 +10,7 @@ gem 'sqlite3'


# Asset template engines # Asset template engines
gem 'json' gem 'json'
gem 'sass-rails', "~> 3.1.0.rc" gem 'sass-rails', "~> 3.1"
gem 'coffee-script' gem 'coffee-script'
gem 'uglifier' gem 'uglifier'


Expand Down
4 changes: 2 additions & 2 deletions tests/rails/Gemfile
@@ -1,5 +1,5 @@
source 'http://w2-stdev-ub10-01.gemstone.com:9292/' source 'http://w2-stdev-ub10-01.gemstone.com:9292'
source 'http://rubygems.org' source 'http://rubygems.org'


gem 'rails', '3.1.0.rc4' gem 'rails', '~>3.1'


5 changes: 2 additions & 3 deletions tests/rails/Rakefile
Expand Up @@ -10,9 +10,8 @@ task :default => [:clean,
'rails:test'] 'rails:test']


task :clean do task :clean do
if File.directory?(PNAME) rm_rf PNAME if File.directory?(PNAME)
rm_rf PNAME rm_f 'Gemfile.lock'
end
end end


namespace :rails do namespace :rails do
Expand Down

0 comments on commit f52dbdb

Please sign in to comment.