Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update rails test to work with Rails 3.1.

  • Loading branch information...
commit f52dbdb8eec380e930ce766a81129eb2cbf242fb 1 parent f2217e1
Peter McLain authored
View
2  examples/rails/.gitignore
@@ -1 +1,3 @@
rails
+Gemfile.lock
+
View
5 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'
View
4 examples/rails/Rakefile
@@ -16,8 +16,8 @@ namespace :patch do
"activesupport-3.0.4" => ['activesupport_class_patch.diff',
'activesupport_time_zone_patch.diff',
'activesupport_descendents_tracker_patch.diff'],
- "activesupport-3.1.0.rc4" => ['activesupport_class_patch-3.1.diff',
- 'activesupport_time_patch-3.1.diff']
+ "activesupport-3.1.0" => ['activesupport_class_patch-3.1.diff',
+ 'activesupport_time_patch-3.1.diff']
}
apply_patches(patch_info)
end
View
5 examples/rails/myapp/Gemfile
@@ -1,6 +1,7 @@
+source 'http://w2-stdev-ub10-01.gemstone.com:9292'
source 'http://rubygems.org'
-gem 'rails', '3.1.0.rc4'
+gem 'rails', '~>3.1'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -9,7 +10,7 @@ gem 'sqlite3'
# Asset template engines
gem 'json'
-gem 'sass-rails', "~> 3.1.0.rc"
+gem 'sass-rails', "~> 3.1"
gem 'coffee-script'
gem 'uglifier'
View
4 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'
-gem 'rails', '3.1.0.rc4'
+gem 'rails', '~>3.1'
View
5 tests/rails/Rakefile
@@ -10,9 +10,8 @@ task :default => [:clean,
'rails:test']
task :clean do
- if File.directory?(PNAME)
- rm_rf PNAME
- end
+ rm_rf PNAME if File.directory?(PNAME)
+ rm_f 'Gemfile.lock'
end
namespace :rails do
Please sign in to comment.
Something went wrong with that request. Please try again.