Download as
Browse Code »

Commit 00ae65b10808289252b1115eb86b90fcddc17d59

Authored by Dmitriy Zaporozhets
1 parent 1c517153
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

try to use stable version for database cleaner

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