diff options
author | Robert Speicher <rspeicher@gmail.com> | 2012-08-23 05:19:40 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2012-08-25 14:19:15 -0400 |
commit | fba174e9bc4e4ef5c0c4d6a4282f37e5265b87e2 (patch) | |
tree | f53e56b4f694ffefac5d3b744f48deccceb1631e /spec/api | |
parent | 852b9c28dd80af4a49336b0ff921a1a863dbc929 (diff) | |
download | gitlab-ce-fba174e9bc4e4ef5c0c4d6a4282f37e5265b87e2.tar.gz |
Cleanup spec/support folder and spec/spec_helper
Changes:
* Move spec/monkeypatch to spec/support
* Remove unused support/shared_examples
* Move support/api to support/api_helpers to match module name
* Move support/login to support/login_helpers to match module name
* Move API specs to requests/api (convention over configuration)
* Remove unused support/js_patch
* Simplify login_as helper
* Move DatabaseCleaner stuff to its own support file
* Remove unnecessary configuration and requires from spec_helper
Diffstat (limited to 'spec/api')
-rw-r--r-- | spec/api/issues_spec.rb | 71 | ||||
-rw-r--r-- | spec/api/projects_spec.rb | 136 | ||||
-rw-r--r-- | spec/api/users_spec.rb | 37 |
3 files changed, 0 insertions, 244 deletions
diff --git a/spec/api/issues_spec.rb b/spec/api/issues_spec.rb deleted file mode 100644 index f6d8e3792c2..00000000000 --- a/spec/api/issues_spec.rb +++ /dev/null @@ -1,71 +0,0 @@ -require 'spec_helper' - -describe Gitlab::API do - let(:user) { Factory :user } - let!(:project) { Factory :project, owner: user } - let!(:issue) { Factory :issue, author: user, assignee: user, project: project } - before { project.add_access(user, :read) } - - describe "GET /issues" do - it "should return authentication error" do - get "#{api_prefix}/issues" - response.status.should == 401 - end - - describe "authenticated GET /issues" do - it "should return an array of issues" do - get "#{api_prefix}/issues?private_token=#{user.private_token}" - response.status.should == 200 - json_response.should be_an Array - json_response.first['title'].should == issue.title - end - end - end - - describe "GET /projects/:id/issues" do - it "should return project issues" do - get "#{api_prefix}/projects/#{project.code}/issues?private_token=#{user.private_token}" - response.status.should == 200 - json_response.should be_an Array - json_response.first['title'].should == issue.title - end - end - - describe "GET /projects/:id/issues/:issue_id" do - it "should return a project issue by id" do - get "#{api_prefix}/projects/#{project.code}/issues/#{issue.id}?private_token=#{user.private_token}" - response.status.should == 200 - json_response['title'].should == issue.title - end - end - - describe "POST /projects/:id/issues" do - it "should create a new project issue" do - post "#{api_prefix}/projects/#{project.code}/issues?private_token=#{user.private_token}", - title: 'new issue', labels: 'label, label2' - response.status.should == 201 - json_response['title'].should == 'new issue' - json_response['description'].should be_nil - json_response['labels'].should == ['label', 'label2'] - end - end - - describe "PUT /projects/:id/issues/:issue_id" do - it "should update a project issue" do - put "#{api_prefix}/projects/#{project.code}/issues/#{issue.id}?private_token=#{user.private_token}", - title: 'updated title', labels: 'label2', closed: 1 - response.status.should == 200 - json_response['title'].should == 'updated title' - json_response['labels'].should == ['label2'] - json_response['closed'].should be_true - end - end - - describe "DELETE /projects/:id/issues/:issue_id" do - it "should delete a project issue" do - expect { - delete "#{api_prefix}/projects/#{project.code}/issues/#{issue.id}?private_token=#{user.private_token}" - }.to change { Issue.count }.by(-1) - end - end -end diff --git a/spec/api/projects_spec.rb b/spec/api/projects_spec.rb deleted file mode 100644 index ff45619e58a..00000000000 --- a/spec/api/projects_spec.rb +++ /dev/null @@ -1,136 +0,0 @@ -require 'spec_helper' - -describe Gitlab::API do - let(:user) { Factory :user } - let!(:project) { Factory :project, owner: user } - let!(:snippet) { Factory :snippet, author: user, project: project, title: 'example' } - before { project.add_access(user, :read) } - - describe "GET /projects" do - it "should return authentication error" do - get "#{api_prefix}/projects" - response.status.should == 401 - end - - describe "authenticated GET /projects" do - it "should return an array of projects" do - get "#{api_prefix}/projects?private_token=#{user.private_token}" - response.status.should == 200 - json_response.should be_an Array - json_response.first['name'].should == project.name - json_response.first['owner']['email'].should == user.email - end - end - end - - describe "GET /projects/:id" do - it "should return a project by id" do - get "#{api_prefix}/projects/#{project.id}?private_token=#{user.private_token}" - response.status.should == 200 - json_response['name'].should == project.name - json_response['owner']['email'].should == user.email - end - - it "should return a project by code name" do - get "#{api_prefix}/projects/#{project.code}?private_token=#{user.private_token}" - response.status.should == 200 - json_response['name'].should == project.name - end - - it "should return a 404 error if not found" do - get "#{api_prefix}/projects/42?private_token=#{user.private_token}" - response.status.should == 404 - json_response['message'].should == '404 Not found' - end - end - - describe "GET /projects/:id/repository/branches" do - it "should return an array of project branches" do - get "#{api_prefix}/projects/#{project.code}/repository/branches?private_token=#{user.private_token}" - response.status.should == 200 - json_response.should be_an Array - json_response.first['name'].should == project.repo.heads.sort_by(&:name).first.name - end - end - - describe "GET /projects/:id/repository/branches/:branch" do - it "should return the branch information for a single branch" do - get "#{api_prefix}/projects/#{project.code}/repository/branches/new_design?private_token=#{user.private_token}" - response.status.should == 200 - - json_response['name'].should == 'new_design' - json_response['commit']['id'].should == '621491c677087aa243f165eab467bfdfbee00be1' - end - end - - describe "GET /projects/:id/repository/tags" do - it "should return an array of project tags" do - get "#{api_prefix}/projects/#{project.code}/repository/tags?private_token=#{user.private_token}" - response.status.should == 200 - json_response.should be_an Array - json_response.first['name'].should == project.repo.tags.sort_by(&:name).reverse.first.name - end - end - - describe "GET /projects/:id/snippets/:snippet_id" do - it "should return a project snippet" do - get "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}" - response.status.should == 200 - json_response['title'].should == snippet.title - end - end - - describe "POST /projects/:id/snippets" do - it "should create a new project snippet" do - post "#{api_prefix}/projects/#{project.code}/snippets?private_token=#{user.private_token}", - title: 'api test', file_name: 'sample.rb', code: 'test' - response.status.should == 201 - json_response['title'].should == 'api test' - end - end - - describe "PUT /projects/:id/snippets" do - it "should update an existing project snippet" do - put "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}", - code: 'updated code' - response.status.should == 200 - json_response['title'].should == 'example' - snippet.reload.content.should == 'updated code' - end - end - - describe "DELETE /projects/:id/snippets/:snippet_id" do - it "should delete existing project snippet" do - expect { - delete "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}" - }.to change { Snippet.count }.by(-1) - end - end - - describe "GET /projects/:id/snippets/:snippet_id/raw" do - it "should get a raw project snippet" do - get "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}/raw?private_token=#{user.private_token}" - response.status.should == 200 - end - end - - describe "GET /projects/:id/:sha/blob" do - it "should get the raw file contents" do - get "#{api_prefix}/projects/#{project.code}/repository/commits/master/blob?filepath=README.md&private_token=#{user.private_token}" - - response.status.should == 200 - end - - it "should return 404 for invalid branch_name" do - get "#{api_prefix}/projects/#{project.code}/repository/commits/invalid_branch_name/blob?filepath=README.md&private_token=#{user.private_token}" - - response.status.should == 404 - end - - it "should return 404 for invalid file" do - get "#{api_prefix}/projects/#{project.code}/repository/commits/master/blob?filepath=README.invalid&private_token=#{user.private_token}" - - response.status.should == 404 - end - end -end diff --git a/spec/api/users_spec.rb b/spec/api/users_spec.rb deleted file mode 100644 index 32b9379d212..00000000000 --- a/spec/api/users_spec.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'spec_helper' - -describe Gitlab::API do - let(:user) { Factory :user } - - describe "GET /users" do - it "should return authentication error" do - get "#{api_prefix}/users" - response.status.should == 401 - end - - describe "authenticated GET /users" do - it "should return an array of users" do - get "#{api_prefix}/users?private_token=#{user.private_token}" - response.status.should == 200 - json_response.should be_an Array - json_response.first['email'].should == user.email - end - end - end - - describe "GET /users/:id" do - it "should return a user by id" do - get "#{api_prefix}/users/#{user.id}?private_token=#{user.private_token}" - response.status.should == 200 - json_response['email'].should == user.email - end - end - - describe "GET /user" do - it "should return current user" do - get "#{api_prefix}/user?private_token=#{user.private_token}" - response.status.should == 200 - json_response['email'].should == user.email - end - end -end |