Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValeriy Sizov <vsv2711@gmail.com>2012-11-07 15:50:42 +0400
committerValeriy Sizov <vsv2711@gmail.com>2012-11-07 15:50:42 +0400
commitd6a5e3dad7a8d5aa1eb2220c2c60f068455dbaed (patch)
tree0add3061531048c554a7cd20ebe79097d8972475 /spec/requests
parent10d881c9cad92169a3105cff0f02601dad4448cf (diff)
parentcf70439e0a61637a8ad12360c53df08320b937b9 (diff)
Merge pull request #1735 from NARKOZ/api
API fixes
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/projects_spec.rb10
-rw-r--r--spec/requests/api/users_spec.rb8
2 files changed, 9 insertions, 9 deletions
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 88bd81969e4..5f9a587d57a 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -46,7 +46,7 @@ describe Gitlab::API do
response.status.should == 201
end
- it "should repsond with 404 on failure" do
+ it "should respond with 404 on failure" do
post api("/projects", user)
response.status.should == 404
end
@@ -188,16 +188,16 @@ describe Gitlab::API do
}.to change {project.hooks.count}.by(1)
end
end
-
+
describe "PUT /projects/:id/hooks/:hook_id" do
it "should update an existing project hook" do
put api("/projects/#{project.code}/hooks/#{hook.id}", user),
- url: 'http://example.com'
+ url: 'http://example.org'
response.status.should == 200
- json_response['url'].should == 'http://example.com'
+ json_response['url'].should == 'http://example.org'
end
end
-
+
describe "DELETE /projects/:id/hooks" do
it "should delete hook from project" do
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index e3049e09016..4c2e6adaf7f 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -4,7 +4,7 @@ describe Gitlab::API do
include ApiHelpers
let(:user) { Factory :user }
- let(:admin) {Factory :admin}
+ let(:admin) { Factory :admin }
let(:key) { Factory :key, user: user }
describe "GET /users" do
@@ -42,9 +42,9 @@ describe Gitlab::API do
end
it "should create user" do
- expect{
- post api("/users", admin), Factory.attributes(:user)
- }.to change{User.count}.by(1)
+ expect {
+ post api("/users", admin), Factory.attributes(:user, projects_limit: 3)
+ }.to change { User.count }.by(1)
end
it "shouldn't available for non admin users" do