deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

try to use stable version for database cleaner

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-28 21:02:41 +02:00
parent 1c517153a8
commit 00ae65b108
4 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -144,7 +144,7 @@ group :development, :test do
gem "capybara", '2.0.2' gem "capybara", '2.0.2'
gem "pry" gem "pry"
gem "awesome_print" gem "awesome_print"
gem "database_cleaner", ref: "9f898fc50d87a5d51760f9dcf374bf5ffda21baf", git: "https://github.com/bmabey/database_cleaner.git" gem "database_cleaner"
gem "launchy" gem "launchy"
gem 'factory_girl_rails' gem 'factory_girl_rails'

10
Gemfile.lock
View file

@ -1,10 +1,3 @@
GIT
remote: https://github.com/bmabey/database_cleaner.git
revision: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
ref: 9f898fc50d87a5d51760f9dcf374bf5ffda21baf
specs:
database_cleaner (0.9.1)
GIT GIT
remote: https://github.com/ctran/annotate_models.git remote: https://github.com/ctran/annotate_models.git
revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e
@ -133,6 +126,7 @@ GEM
connection_pool (1.0.0) connection_pool (1.0.0)
crack (0.3.1) crack (0.3.1)
daemons (1.1.9) daemons (1.1.9)
database_cleaner (0.9.1)
debug_inspector (0.0.2) debug_inspector (0.0.2)
devise (2.1.2) devise (2.1.2)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
@ -474,7 +468,7 @@ DEPENDENCIES
chosen-rails (= 0.9.8) chosen-rails (= 0.9.8)
coffee-rails (~> 3.2.2) coffee-rails (~> 3.2.2)
colored colored
database_cleaner! database_cleaner
devise (~> 2.1.0) devise (~> 2.1.0)
draper (~> 0.18.0) draper (~> 0.18.0)
email_spec email_spec

4
features/steps/project/project_merge_requests.rb
View file

@ -84,11 +84,11 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end end
And 'I switch to the diff tab' do 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 end
And 'I switch to the merge request\'s comments tab' do 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 end
And 'I click on the first commit in the merge request' do And 'I click on the first commit in the merge request' do

1
features/support/env.rb
View file

@ -34,6 +34,7 @@ Spinach.hooks.before_scenario do
Gitlab.config.gitlab_shell.stub(repos_path: Rails.root.join('tmp', 'test-git-base-path')) 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.rm_rf Gitlab.config.gitlab_shell.repos_path
FileUtils.mkdir_p Gitlab.config.gitlab_shell.repos_path FileUtils.mkdir_p Gitlab.config.gitlab_shell.repos_path
DatabaseCleaner.start
end end
Spinach.hooks.after_scenario do Spinach.hooks.after_scenario do