Skip to content
Snippets Groups Projects
Commit 00ae65b1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

try to use stable version for database cleaner

parent 1c517153
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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'
 
Loading
Loading
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
Loading
Loading
@@ -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)
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment