From f52dbdb8eec380e930ce766a81129eb2cbf242fb Mon Sep 17 00:00:00 2001
From: Peter McLain <pmclain@vmware.com>
Date: Fri, 2 Sep 2011 09:24:16 -0700
Subject: [PATCH] Update rails test to work with Rails 3.1.

---
 examples/rails/.gitignore    | 2 ++
 examples/rails/Gemfile       | 5 +++++
 examples/rails/Rakefile      | 4 ++--
 examples/rails/myapp/Gemfile | 5 +++--
 tests/rails/Gemfile          | 4 ++--
 tests/rails/Rakefile         | 5 ++---
 6 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 examples/rails/Gemfile

diff --git a/examples/rails/.gitignore b/examples/rails/.gitignore
index 1ad5335ff..d8df65bad 100644
--- a/examples/rails/.gitignore
+++ b/examples/rails/.gitignore
@@ -1 +1,3 @@
 rails
+Gemfile.lock
+
diff --git a/examples/rails/Gemfile b/examples/rails/Gemfile
new file mode 100644
index 000000000..018fffb5f
--- /dev/null
+++ b/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'
diff --git a/examples/rails/Rakefile b/examples/rails/Rakefile
index d738ad598..523685677 100644
--- a/examples/rails/Rakefile
+++ b/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
diff --git a/examples/rails/myapp/Gemfile b/examples/rails/myapp/Gemfile
index bbb5be192..a7801dfb6 100644
--- a/examples/rails/myapp/Gemfile
+++ b/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'
 
diff --git a/tests/rails/Gemfile b/tests/rails/Gemfile
index 1092d100f..3b47a5f8b 100644
--- a/tests/rails/Gemfile
+++ b/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'
 
diff --git a/tests/rails/Rakefile b/tests/rails/Rakefile
index cf1457d88..5898e28d1 100644
--- a/tests/rails/Rakefile
+++ b/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