From 00ae65b10808289252b1115eb86b90fcddc17d59 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 28 Feb 2013 21:02:41 +0200
Subject: [PATCH] try to use stable version for database cleaner
---
Gemfile | 2 +-
Gemfile.lock | 10 ++--------
features/steps/project/project_merge_requests.rb | 4 ++--
features/support/env.rb | 1 +
4 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/Gemfile b/Gemfile
index 723cfd8b0585e..e6dfec9f49bb4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -144,7 +144,7 @@ group :development, :test do
gem "capybara", '2.0.2'
gem "pry"
gem "awesome_print"
- gem "database_cleaner", ref: "9f898fc50d87a5d51760f9dcf374bf5ffda21baf", git: "https://github.com/bmabey/database_cleaner.git"
+ gem "database_cleaner"
gem "launchy"
gem 'factory_girl_rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9ee413d4738de..76f1c214c5e51 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,3 @@
-GIT
- remote: https://github.com/bmabey/database_cleaner.git
- revision: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
- ref: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
- specs:
- database_cleaner (0.9.1)
-
GIT
remote: https://github.com/ctran/annotate_models.git
revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e
@@ -133,6 +126,7 @@ GEM
connection_pool (1.0.0)
crack (0.3.1)
daemons (1.1.9)
+ database_cleaner (0.9.1)
debug_inspector (0.0.2)
devise (2.1.2)
bcrypt-ruby (~> 3.0)
@@ -474,7 +468,7 @@ DEPENDENCIES
chosen-rails (= 0.9.8)
coffee-rails (~> 3.2.2)
colored
- database_cleaner!
+ database_cleaner
devise (~> 2.1.0)
draper (~> 0.18.0)
email_spec
diff --git a/features/steps/project/project_merge_requests.rb b/features/steps/project/project_merge_requests.rb
index 09ce6b720d7e8..4c22119b07eeb 100644
--- a/features/steps/project/project_merge_requests.rb
+++ b/features/steps/project/project_merge_requests.rb
@@ -84,11 +84,11 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
And 'I switch to the diff tab' do
- visit diffs_project_merge_request_path(merge_request.project, merge_request)
+ visit diffs_project_merge_request_path(project, merge_request)
end
And 'I switch to the merge request\'s comments tab' do
- visit project_merge_request_path(merge_request.project, merge_request)
+ visit project_merge_request_path(project, merge_request)
end
And 'I click on the first commit in the merge request' do
diff --git a/features/support/env.rb b/features/support/env.rb
index da40b38b79ca2..2fd7ffdb81307 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -34,6 +34,7 @@
Gitlab.config.gitlab_shell.stub(repos_path: Rails.root.join('tmp', 'test-git-base-path'))
FileUtils.rm_rf Gitlab.config.gitlab_shell.repos_path
FileUtils.mkdir_p Gitlab.config.gitlab_shell.repos_path
+ DatabaseCleaner.start
end
Spinach.hooks.after_scenario do
--
GitLab