Download as
Browse Code »

Commit 9b6224f99cacdce3bcbec9a2c1ef4d8af296c56c

Authored by Dmitriy Zaporozhets
1 parent e1dd76d5
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

More test fixes 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 3 changed files with 11 additions and 14 deletions   Show diff stats
app/services/merge_requests/create_service.rb
  Diff comments   View file @9b6224f
@@ -3,6 +3,7 @@ module MergeRequests @@ -3,6 +3,7 @@ module MergeRequests
3 def execute 3 def execute
4 merge_request = MergeRequest.new(params) 4 merge_request = MergeRequest.new(params)
5 merge_request.source_project = project 5 merge_request.source_project = project
  6 + merge_request.target_project ||= project
6 merge_request.author = current_user 7 merge_request.author = current_user
7 8
8 if merge_request.save 9 if merge_request.save
spec/requests/api/merge_requests_spec.rb
  Diff comments   View file @9b6224f
@@ -6,7 +6,7 @@ describe API::API do @@ -6,7 +6,7 @@ describe API::API do
6 after(:each) { ActiveRecord::Base.observers.disable(:user_observer) } 6 after(:each) { ActiveRecord::Base.observers.disable(:user_observer) }
7 let(:user) { create(:user) } 7 let(:user) { create(:user) }
8 let!(:project) {create(:project, creator_id: user.id, namespace: user.namespace) } 8 let!(:project) {create(:project, creator_id: user.id, namespace: user.namespace) }
9 - let!(:merge_request) { create(:merge_request, author: user, assignee: user, source_project: project, target_project: project, title: "Test") } 9 + let!(:merge_request) { create(:merge_request, :simple, author: user, assignee: user, source_project: project, target_project: project, title: "Test") }
10 let!(:note) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "a comment on a MR") } 10 let!(:note) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "a comment on a MR") }
11 before { 11 before {
12 project.team << [user, :reporters] 12 project.team << [user, :reporters]
@@ -79,16 +79,12 @@ describe API::API do @@ -79,16 +79,12 @@ describe API::API do
79 end 79 end
80 80
81 context 'forked projects' do 81 context 'forked projects' do
82 - let!(:user2) {create(:user)}  
83 - let!(:forked_project_link) { build(:forked_project_link) }  
84 - let!(:fork_project) { create(:project, forked_project_link: forked_project_link, namespace: user2.namespace, creator_id: user2.id) }  
85 - let!(:unrelated_project) { create(:project, namespace: create(:user).namespace, creator_id: user2.id) } 82 + let!(:user2) { create(:user) }
  83 + let!(:fork_project) { create(:project, forked_from_project: project, namespace: user2.namespace, creator_id: user2.id) }
  84 + let!(:unrelated_project) { create(:project, namespace: create(:user).namespace, creator_id: user2.id) }
86 85
87 before :each do |each| 86 before :each do |each|
88 fork_project.team << [user2, :reporters] 87 fork_project.team << [user2, :reporters]
89 - forked_project_link.forked_from_project = project  
90 - forked_project_link.forked_to_project = fork_project  
91 - forked_project_link.save!  
92 end 88 end
93 89
94 it "should return merge_request" do 90 it "should return merge_request" do
@@ -127,16 +123,16 @@ describe API::API do @@ -127,16 +123,16 @@ describe API::API do
127 response.status.should == 400 123 response.status.should == 400
128 end 124 end
129 125
130 - it "should return 400 when target_branch is specified and not a forked project" do 126 + it "should return 404 when target_branch is specified and not a forked project" do
131 post api("/projects/#{project.id}/merge_requests", user), 127 post api("/projects/#{project.id}/merge_requests", user),
132 title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user, target_project_id: fork_project.id 128 title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user, target_project_id: fork_project.id
133 - response.status.should == 400 129 + response.status.should == 404
134 end 130 end
135 131
136 - it "should return 400 when target_branch is specified and for a different fork" do 132 + it "should return 404 when target_branch is specified and for a different fork" do
137 post api("/projects/#{fork_project.id}/merge_requests", user2), 133 post api("/projects/#{fork_project.id}/merge_requests", user2),
138 title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: unrelated_project.id 134 title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: unrelated_project.id
139 - response.status.should == 400 135 + response.status.should == 404
140 end 136 end
141 137
142 it "should return 201 when target_branch is specified and for the same project" do 138 it "should return 201 when target_branch is specified and for the same project" do
spec/services/notification_service_spec.rb
  Diff comments   View file @9b6224f
@@ -5,7 +5,7 @@ describe NotificationService do @@ -5,7 +5,7 @@ describe NotificationService do
5 5
6 describe 'Keys' do 6 describe 'Keys' do
7 describe :new_key do 7 describe :new_key do
8 - let(:key) { create(:personal_key) } 8 + let!(:key) { create(:personal_key) }
9 9
10 it { notification.new_key(key).should be_true } 10 it { notification.new_key(key).should be_true }
11 11
@@ -18,7 +18,7 @@ describe NotificationService do @@ -18,7 +18,7 @@ describe NotificationService do
18 18
19 describe 'Email' do 19 describe 'Email' do
20 describe :new_email do 20 describe :new_email do
21 - let(:email) { create(:email) } 21 + let!(:email) { create(:email) }
22 22
23 it { notification.new_email(email).should be_true } 23 it { notification.new_email(email).should be_true }
24 24