Download as
Browse Code »

Commit cee68dec8a9b9531690da0f81fbe1ebdc31a7eea

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

Fix api merge request specs 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 1 changed file with 16 additions and 17 deletions   Show diff stats
spec/requests/api/merge_requests_spec.rb
  Diff comments   View file @cee68de
@@ -47,32 +47,32 @@ describe API::API do @@ -47,32 +47,32 @@ describe API::API do
47 context 'between branches projects' do 47 context 'between branches projects' do
48 it "should return merge_request" do 48 it "should return merge_request" do
49 post api("/projects/#{project.id}/merge_requests", user), 49 post api("/projects/#{project.id}/merge_requests", user),
50 - title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user 50 + title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user
51 response.status.should == 201 51 response.status.should == 201
52 json_response['title'].should == 'Test merge_request' 52 json_response['title'].should == 'Test merge_request'
53 end 53 end
54 54
55 it "should return 422 when source_branch equals target_branch" do 55 it "should return 422 when source_branch equals target_branch" do
56 post api("/projects/#{project.id}/merge_requests", user), 56 post api("/projects/#{project.id}/merge_requests", user),
57 - title: "Test merge_request", source_branch: "master", target_branch: "master", author: user 57 + title: "Test merge_request", source_branch: "master", target_branch: "master", author: user
58 response.status.should == 422 58 response.status.should == 422
59 end 59 end
60 60
61 it "should return 400 when source_branch is missing" do 61 it "should return 400 when source_branch is missing" do
62 post api("/projects/#{project.id}/merge_requests", user), 62 post api("/projects/#{project.id}/merge_requests", user),
63 - title: "Test merge_request", target_branch: "master", author: user 63 + title: "Test merge_request", target_branch: "master", author: user
64 response.status.should == 400 64 response.status.should == 400
65 end 65 end
66 66
67 it "should return 400 when target_branch is missing" do 67 it "should return 400 when target_branch is missing" do
68 post api("/projects/#{project.id}/merge_requests", user), 68 post api("/projects/#{project.id}/merge_requests", user),
69 - title: "Test merge_request", source_branch: "stable", author: user 69 + title: "Test merge_request", source_branch: "stable", author: user
70 response.status.should == 400 70 response.status.should == 400
71 end 71 end
72 72
73 it "should return 400 when title is missing" do 73 it "should return 400 when title is missing" do
74 post api("/projects/#{project.id}/merge_requests", user), 74 post api("/projects/#{project.id}/merge_requests", user),
75 - target_branch: 'master', source_branch: 'stable' 75 + target_branch: 'master', source_branch: 'stable'
76 response.status.should == 400 76 response.status.should == 400
77 end 77 end
78 end 78 end
@@ -80,8 +80,8 @@ describe API::API do @@ -80,8 +80,8 @@ describe API::API do
80 context 'forked projects' do 80 context 'forked projects' do
81 let!(:user2) {create(:user)} 81 let!(:user2) {create(:user)}
82 let!(:forked_project_link) { build(:forked_project_link) } 82 let!(:forked_project_link) { build(:forked_project_link) }
83 - let!(:fork_project) { create(:source_project, forked_project_link: forked_project_link, namespace: user2.namespace, creator_id: user2.id) }  
84 - let!(:unrelated_project) { create(:target_project, namespace: user2.namespace, creator_id: user2.id) } 83 + let!(:fork_project) { create(:project, forked_project_link: forked_project_link, namespace: user2.namespace, creator_id: user2.id) }
  84 + let!(:unrelated_project) { create(:project, namespace: create(:user).namespace, creator_id: user2.id) }
85 85
86 before :each do |each| 86 before :each do |each|
87 fork_project.team << [user2, :reporters] 87 fork_project.team << [user2, :reporters]
@@ -92,7 +92,7 @@ describe API::API do @@ -92,7 +92,7 @@ describe API::API do
92 92
93 it "should return merge_request" do 93 it "should return merge_request" do
94 post api("/projects/#{fork_project.id}/merge_requests", user2), 94 post api("/projects/#{fork_project.id}/merge_requests", user2),
95 - title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user2, target_project_id: project.id 95 + title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user2, target_project_id: project.id
96 response.status.should == 201 96 response.status.should == 201
97 json_response['title'].should == 'Test merge_request' 97 json_response['title'].should == 'Test merge_request'
98 end 98 end
@@ -102,44 +102,44 @@ describe API::API do @@ -102,44 +102,44 @@ describe API::API do
102 fork_project.forked?.should be_true 102 fork_project.forked?.should be_true
103 fork_project.forked_from_project.should == project 103 fork_project.forked_from_project.should == project
104 post api("/projects/#{fork_project.id}/merge_requests", user2), 104 post api("/projects/#{fork_project.id}/merge_requests", user2),
105 - title: 'Test merge_request', source_branch: "master", target_branch: "master", author: user2, target_project_id: project.id 105 + title: 'Test merge_request', source_branch: "master", target_branch: "master", author: user2, target_project_id: project.id
106 response.status.should == 201 106 response.status.should == 201
107 json_response['title'].should == 'Test merge_request' 107 json_response['title'].should == 'Test merge_request'
108 end 108 end
109 109
110 it "should return 400 when source_branch is missing" do 110 it "should return 400 when source_branch is missing" do
111 post api("/projects/#{fork_project.id}/merge_requests", user2), 111 post api("/projects/#{fork_project.id}/merge_requests", user2),
112 - title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id 112 + title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id
113 response.status.should == 400 113 response.status.should == 400
114 end 114 end
115 115
116 it "should return 400 when target_branch is missing" do 116 it "should return 400 when target_branch is missing" do
117 post api("/projects/#{fork_project.id}/merge_requests", user2), 117 post api("/projects/#{fork_project.id}/merge_requests", user2),
118 - title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id 118 + title: 'Test merge_request', target_branch: "master", author: user2, target_project_id: project.id
119 response.status.should == 400 119 response.status.should == 400
120 end 120 end
121 121
122 it "should return 400 when title is missing" do 122 it "should return 400 when title is missing" do
123 post api("/projects/#{fork_project.id}/merge_requests", user2), 123 post api("/projects/#{fork_project.id}/merge_requests", user2),
124 - target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: project.id 124 + target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: project.id
125 response.status.should == 400 125 response.status.should == 400
126 end 126 end
127 127
128 it "should return 400 when target_branch is specified and not a forked project" do 128 it "should return 400 when target_branch is specified and not a forked project" do
129 post api("/projects/#{project.id}/merge_requests", user), 129 post api("/projects/#{project.id}/merge_requests", user),
130 - title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user, target_project_id: fork_project.id 130 + title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user, target_project_id: fork_project.id
131 response.status.should == 400 131 response.status.should == 400
132 end 132 end
133 133
134 it "should return 400 when target_branch is specified and for a different fork" do 134 it "should return 400 when target_branch is specified and for a different fork" do
135 post api("/projects/#{fork_project.id}/merge_requests", user2), 135 post api("/projects/#{fork_project.id}/merge_requests", user2),
136 - title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: unrelated_project.id 136 + title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: unrelated_project.id
137 response.status.should == 400 137 response.status.should == 400
138 end 138 end
139 139
140 it "should return 201 when target_branch is specified and for the same project" do 140 it "should return 201 when target_branch is specified and for the same project" do
141 post api("/projects/#{fork_project.id}/merge_requests", user2), 141 post api("/projects/#{fork_project.id}/merge_requests", user2),
142 - title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: fork_project.id 142 + title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: fork_project.id
143 response.status.should == 201 143 response.status.should == 201
144 end 144 end
145 end 145 end
@@ -170,7 +170,7 @@ describe API::API do @@ -170,7 +170,7 @@ describe API::API do
170 170
171 it "should return 422 when source_branch and target_branch are renamed the same" do 171 it "should return 422 when source_branch and target_branch are renamed the same" do
172 put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), 172 put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user),
173 - source_branch: "master", target_branch: "master" 173 + source_branch: "master", target_branch: "master"
174 response.status.should == 422 174 response.status.should == 422
175 end 175 end
176 176
@@ -198,5 +198,4 @@ describe API::API do @@ -198,5 +198,4 @@ describe API::API do
198 response.status.should == 404 198 response.status.should == 404
199 end 199 end
200 end 200 end
201 -  
202 end 201 end