summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-03 10:36:10 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-03 10:36:10 +0300
commit9b598fa62d73c5a66d7fed872db943859e2d6a5a (patch)
tree3bcc3a4afeacab716e90d1ef18d78dbcd46c941e /features
parent9ee697dd6847de0bd1a38714df7d8bb509534d20 (diff)
downloadgitlab-ce-9b598fa62d73c5a66d7fed872db943859e2d6a5a.tar.gz
Fix MR fork validation and services load
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r--features/steps/dashboard/merge_requests.rb6
-rw-r--r--features/support/env.rb2
2 files changed, 3 insertions, 5 deletions
diff --git a/features/steps/dashboard/merge_requests.rb b/features/steps/dashboard/merge_requests.rb
index 62d84506c49..e198bc0cf9c 100644
--- a/features/steps/dashboard/merge_requests.rb
+++ b/features/steps/dashboard/merge_requests.rb
@@ -53,15 +53,15 @@ class DashboardMergeRequests < Spinach::FeatureSteps
end
def assigned_merge_request
- @assigned_merge_request ||= create :merge_request, assignee: current_user, target_project: project
+ @assigned_merge_request ||= create :merge_request, assignee: current_user, target_project: project, source_project: project
end
def authored_merge_request
- @authored_merge_request ||= create :merge_request, author: current_user, target_project: project
+ @authored_merge_request ||= create :merge_request, source_branch: 'simple_merge_request', author: current_user, target_project: project, source_project: project
end
def other_merge_request
- @other_merge_request ||= create :merge_request, target_project: project
+ @other_merge_request ||= create :merge_request, source_branch: '2_3_notes_fix', target_project: project, source_project: project
end
def project
diff --git a/features/support/env.rb b/features/support/env.rb
index 7b11f5a7c6f..a5b297775db 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -52,6 +52,4 @@ Spinach.hooks.before_run do
RSpec::Mocks::setup self
include FactoryGirl::Syntax::Methods
- MergeRequestObserver.any_instance.stub(current_user: create(:user))
end
-