try to use stable version for database cleaner

2 files changed, 3 insertions, 2 deletions

diff --git a/features/steps/project/project_merge_requests.rb b/features/steps/project/project_merge_requests.rb
index 09ce6b720d7..4c22119b07e 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 da40b38b79c..2fd7ffdb813 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -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