try to use stable version for database cleaner

Dmitriy Zaporozhets
1 parent 1c517153
Showing 4 changed files with 6 additions and 11 deletions Show diff stats
Gemfile
Gemfile.lock
features/steps/project/project_merge_requests.rb
features/support/env.rb
@@ -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'
  
 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
   specs:
@@ -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
@@ -84,11 +84,11 @@ class ProjectMergeRequests &lt; 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
@@ -34,6 +34,7 @@ Spinach.hooks.before_scenario do
   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
...	...	@@ -144,7 +144,7 @@ group :development, :test do
144	144	gem "capybara", '2.0.2'
145	145	gem "pry"
146	146	gem "awesome_print"
147		- gem "database_cleaner", ref: "9f898fc50d87a5d51760f9dcf374bf5ffda21baf", git: "https://github.com/bmabey/database_cleaner.git"
	147	+ gem "database_cleaner"
148	148	gem "launchy"
149	149	gem 'factory_girl_rails'
150	150
...	...
1	1	GIT
2		- remote: https://github.com/bmabey/database_cleaner.git
3		- revision: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
4		- ref: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
5		- specs:
6		- database_cleaner (0.9.1)
7		-
8		-GIT
9	2	remote: https://github.com/ctran/annotate_models.git
10	3	revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e
11	4	specs:
...	...	@@ -133,6 +126,7 @@ GEM
133	126	connection_pool (1.0.0)
134	127	crack (0.3.1)
135	128	daemons (1.1.9)
	129	+ database_cleaner (0.9.1)
136	130	debug_inspector (0.0.2)
137	131	devise (2.1.2)
138	132	bcrypt-ruby (~> 3.0)
...	...	@@ -474,7 +468,7 @@ DEPENDENCIES
474	468	chosen-rails (= 0.9.8)
475	469	coffee-rails (~> 3.2.2)
476	470	colored
477		- database_cleaner!
	471	+ database_cleaner
478	472	devise (~> 2.1.0)
479	473	draper (~> 0.18.0)
480	474	email_spec
...	...
...	...	@@ -84,11 +84,11 @@ class ProjectMergeRequests < Spinach::FeatureSteps
84	84	end
85	85
86	86	And 'I switch to the diff tab' do
87		- visit diffs_project_merge_request_path(merge_request.project, merge_request)
	87	+ visit diffs_project_merge_request_path(project, merge_request)
88	88	end
89	89
90	90	And 'I switch to the merge request\'s comments tab' do
91		- visit project_merge_request_path(merge_request.project, merge_request)
	91	+ visit project_merge_request_path(project, merge_request)
92	92	end
93	93
94	94	And 'I click on the first commit in the merge request' do
...	...
...	...	@@ -34,6 +34,7 @@ Spinach.hooks.before_scenario do
34	34	Gitlab.config.gitlab_shell.stub(repos_path: Rails.root.join('tmp', 'test-git-base-path'))
35	35	FileUtils.rm_rf Gitlab.config.gitlab_shell.repos_path
36	36	FileUtils.mkdir_p Gitlab.config.gitlab_shell.repos_path
	37	+ DatabaseCleaner.start
37	38	end
38	39
39	40	Spinach.hooks.after_scenario do
...	...