Download as
Browse Code »

Commit 499ff8b441b517902a0daf79600a59cc1830730e

Authored by miks
1 parent 0d1009af
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fix failing tests

Showing 1 changed file with 9 additions and 8 deletions   Show diff stats
spec/requests/api/projects_spec.rb
  Diff comments   View file @499ff8b
... ... @@ -8,7 +8,8 @@ describe Gitlab::API do
8 8 let(:user3) { Factory.create(:user) }
9 9 let!(:project) { Factory :project, owner: user }
10 10 let!(:snippet) { Factory :snippet, author: user, project: project, title: 'example' }
11   - let!(:users_project) { Factory :users_project, user: user, project: project }
  11 + let!(:users_project) { Factory :users_project, user: user, project: project, project_access: UsersProject::MASTER }
  12 + let!(:users_project2) { Factory :users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER }
12 13 before { project.add_access(user, :read) }
13 14  
14 15 describe "GET /projects" do
... ... @@ -114,7 +115,7 @@ describe Gitlab::API do
114 115 response.status.should == 200
115 116  
116 117 json_response.should be_an Array
117   - json_response.count.should == 1
  118 + json_response.count.should == 2
118 119 json_response.first['user']['id'].should == user.id
119 120 end
120 121 end
... ... @@ -123,8 +124,8 @@ describe Gitlab::API do
123 124 it "should add users to project" do
124 125 expect {
125 126 post api("/projects/#{project.code}/users", user),
126   - user_ids: {"0" => user2.id, "1" => user3.id}, project_access: UsersProject::DEVELOPER
127   - }.to change {project.users_projects.where(:project_access => UsersProject::DEVELOPER).count}.by(2)
  127 + user_ids: {"0" => user2.id}, project_access: UsersProject::DEVELOPER
  128 + }.to change {project.users_projects.where(:project_access => UsersProject::DEVELOPER).count}.by(1)
128 129 end
129 130 end
130 131  
... ... @@ -132,8 +133,8 @@ describe Gitlab::API do
132 133 it "should update users to new access role" do
133 134 expect {
134 135 put api("/projects/#{project.code}/users", user),
135   - user_ids: {"0" => user}, project_access: UsersProject::DEVELOPER
136   - }.to change {project.users_projects.where(:project_access => UsersProject::DEVELOPER).count}.by(1)
  136 + user_ids: {"0" => user3.id}, project_access: UsersProject::MASTER
  137 + }.to change {project.users_projects.where(:project_access => UsersProject::MASTER).count}.by(1)
137 138 end
138 139 end
139 140  
... ... @@ -141,8 +142,8 @@ describe Gitlab::API do
141 142 it "should delete users from project" do
142 143 expect {
143 144 delete api("/projects/#{project.code}/users", user),
144   - user_ids: {"0" => users_project.id}
145   - }.to change {project.users_projects.where(:project_access => UsersProject::DEVELOPER).count}.by(-1)
  145 + user_ids: {"0" => user3.id}
  146 + }.to change {project.users_projects.count}.by(-1)
146 147 end
147 148 end
148 149  
... ...