Commit 4bd30245 authored by Alex Denisov's avatar Alex Denisov

json_spec removed

parent b73d4419
...@@ -117,7 +117,6 @@ group :test do ...@@ -117,7 +117,6 @@ group :test do
gem 'email_spec' gem 'email_spec'
gem 'resque_spec' gem 'resque_spec'
gem "webmock" gem "webmock"
gem 'json_spec'
end end
group :production do group :production do
......
...@@ -207,9 +207,6 @@ GEM ...@@ -207,9 +207,6 @@ GEM
jquery-rails jquery-rails
railties (>= 3.1.0) railties (>= 3.1.0)
json (1.7.5) json (1.7.5)
json_spec (1.0.3)
multi_json (~> 1.0)
rspec (~> 2.0)
kaminari (0.14.0) kaminari (0.14.0)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
...@@ -409,7 +406,6 @@ DEPENDENCIES ...@@ -409,7 +406,6 @@ DEPENDENCIES
httparty httparty
jquery-rails (= 2.0.2) jquery-rails (= 2.0.2)
jquery-ui-rails (= 0.5.0) jquery-ui-rails (= 0.5.0)
json_spec
kaminari kaminari
launchy launchy
letter_opener letter_opener
......
...@@ -27,37 +27,40 @@ describe Gitlab::API do ...@@ -27,37 +27,40 @@ describe Gitlab::API do
describe "POST /projects" do describe "POST /projects" do
it "should create new project without code and path" do it "should create new project without code and path" do
expect { expect { post api("/projects", user), name: 'foo' }.to change {Project.count}.by(1)
name = "foo" end
post api("/projects", user), {
name: name it "should not create new project without name" do
} expect { post api("/projects", user) }.to_not change {Project.count}
response.status.should == 201 end
json_response["name"].should == name
json_response["code"].should == name it "should respond with 201 on success" do
json_response["path"].should == name post api("/projects", user), name: 'foo'
}.should change{Project.count}.by(1)
end
it "should create new project" do
attributes = Factory.attributes(:project,
name: "foo",
path: "bar",
code: "bazz",
description: "foo project",
default_branch: "default_branch",
issues_enabled: false,
wall_enabled: false,
merge_requests_enabled: false,
wiki_enabled: false)
post api("/projects", user), attributes
response.status.should == 201 response.status.should == 201
response.body.should be_json_eql(attributes.to_json).excluding("owner", "private")
end end
it "should not create project without name" do
expect { it "should repsond with 404 on failure" do
post api("/projects", user) post api("/projects", user)
response.status.should == 404 response.status.should == 404
}.should_not change{Project.count} end
it "should assign attributes to project" do
project = Factory.attributes(:project, {
path: 'path',
code: 'code',
description: Faker::Lorem.sentence,
default_branch: 'stable',
issues_enabled: false,
wall_enabled: false,
merge_requests_enabled: false,
wiki_enabled: false
})
post api("/projects", user), project
project.each_pair do |k,v|
json_response[k.to_s].should == v
end
end end
end end
......
...@@ -28,7 +28,6 @@ RSpec.configure do |config| ...@@ -28,7 +28,6 @@ RSpec.configure do |config|
config.include LoginHelpers, type: :request config.include LoginHelpers, type: :request
config.include GitoliteStub config.include GitoliteStub
config.include FactoryGirl::Syntax::Methods config.include FactoryGirl::Syntax::Methods
config.include JsonSpec::Helpers
# If you're not using ActiveRecord, or you'd prefer not to run each of your # If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, remove the following line or assign false # examples within a transaction, remove the following line or assign false
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment