From df06b04d83d4664754155b6361a52b2039f7bcba Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Mon, 5 Dec 2011 20:20:48 -0800
Subject: [PATCH] Perhaps the bundler prerelease is the reason we're running
 specs twice? Let's see.

---
 .travis.yml          | 1 -
 lib/tasks/ci.rake    | 2 +-
 lib/tasks/rspec.rake | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9389c7bf0..327d60d4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ env:
   - DB=postgres BUILD_TYPE=other
   - DB=mysql BUILD_TYPE=other
 
-before_install: gem install bundler --pre
 bundler_args: "--without development production"
 before_script: "./config/ci/before-travis.sh"
 script: "bundle exec rake travis"
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index b6146d224..46666ae69 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -7,7 +7,7 @@ namespace :ci do
       system("export DISPLAY=:99.0 && bundle exec rake cucumber")
       raise "Cucumber failed!" unless $?.exitstatus == 0
     else
-      ["rake spec:fixtures", "rake spec", "rake jasmine:ci"].each do |cmd|
+      ["rake generate_fixtures", "rake spec", "rake jasmine:ci"].each do |cmd|
         puts "Running #{cmd}..."
         system("export DISPLAY=:99.0 && bundle exec #{cmd}")
         raise "#{cmd} failed!" unless $?.exitstatus == 0
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
index 8fab027ac..83dafca40 100644
--- a/lib/tasks/rspec.rake
+++ b/lib/tasks/rspec.rake
@@ -16,7 +16,7 @@ begin
   RSpec::Core::RakeTask.new(:spec => spec_prereq)
 
   desc "Run all specs that generate fixtures for rspec or jasmine"
-  RSpec::Core::RakeTask.new(:'spec:fixtures' => spec_prereq) do |t|
+  RSpec::Core::RakeTask.new(:generate_fixtures => spec_prereq) do |t|
     t.rspec_opts = ['--tag fixture']
   end