diff options
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | spec/requests/api/projects_spec.rb | 61 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 |
4 files changed, 32 insertions, 35 deletions
@@ -117,7 +117,6 @@ group :test do gem 'email_spec' gem 'resque_spec' gem "webmock" - gem 'json_spec' end group :production do diff --git a/Gemfile.lock b/Gemfile.lock index ae85a43a7bf..7ec37f59dfc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -207,9 +207,6 @@ GEM jquery-rails railties (>= 3.1.0) json (1.7.5) - json_spec (1.0.3) - multi_json (~> 1.0) - rspec (~> 2.0) kaminari (0.14.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -409,7 +406,6 @@ DEPENDENCIES httparty jquery-rails (= 2.0.2) jquery-ui-rails (= 0.5.0) - json_spec kaminari launchy letter_opener diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index 43c44974bb0..1373748f50d 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -27,37 +27,40 @@ describe Gitlab::API do describe "POST /projects" do it "should create new project without code and path" do - expect { - name = "foo" - post api("/projects", user), { - name: name - } - response.status.should == 201 - json_response["name"].should == name - json_response["code"].should == name - json_response["path"].should == name - }.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 + expect { post api("/projects", user), name: 'foo' }.to change {Project.count}.by(1) + end + + it "should not create new project without name" do + expect { post api("/projects", user) }.to_not change {Project.count} + end + + it "should respond with 201 on success" do + post api("/projects", user), name: 'foo' response.status.should == 201 - response.body.should be_json_eql(attributes.to_json).excluding("owner", "private") end - it "should not create project without name" do - expect { - post api("/projects", user) - response.status.should == 404 - }.should_not change{Project.count} + + it "should repsond with 404 on failure" do + post api("/projects", user) + response.status.should == 404 + 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 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 30a213bac18..d381b3f1e2e 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -28,7 +28,6 @@ RSpec.configure do |config| config.include LoginHelpers, type: :request config.include GitoliteStub 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 # examples within a transaction, remove the following line or assign false |