[#105] add missing specs
This commit is contained in:
parent
3fd99a42d2
commit
dad840f973
|
@ -5,19 +5,39 @@ def create_pull to_ref, from_ref, owner, project = @project
|
||||||
pull = project.pull_requests.new :issue_attributes => {:title => 'test', :body => 'testing'}
|
pull = project.pull_requests.new :issue_attributes => {:title => 'test', :body => 'testing'}
|
||||||
pull.issue.user, pull.issue.project = owner, pull.to_project
|
pull.issue.user, pull.issue.project = owner, pull.to_project
|
||||||
pull.to_ref, pull.from_ref, pull.from_project = to_ref, from_ref, project
|
pull.to_ref, pull.from_ref, pull.from_project = to_ref, from_ref, project
|
||||||
pull.save
|
pull.save; pull.check
|
||||||
pull
|
pull
|
||||||
end
|
end
|
||||||
|
|
||||||
describe Api::V1::PullRequestsController do
|
describe Api::V1::PullRequestsController do
|
||||||
before(:each) do
|
before(:all) do
|
||||||
stub_symlink_methods
|
stub_symlink_methods
|
||||||
stub_redis
|
stub_redis
|
||||||
@project = FactoryGirl.create(:project_with_commit)
|
@project = FactoryGirl.create(:project_with_commit)
|
||||||
@pull = create_pull 'master', 'non_conflicts', @project.owner
|
@pull = create_pull 'master', 'non_conflicts', @project.owner
|
||||||
|
|
||||||
|
@another_project = FactoryGirl.create(:project_with_commit)
|
||||||
|
@another_pull = create_pull 'master', 'non_conflicts', @another_project.owner, @another_project
|
||||||
|
|
||||||
|
@hidden_project = FactoryGirl.create(:project_with_commit)
|
||||||
|
@hidden_project.update_column :visibility, 'hidden'
|
||||||
|
@hidden_pull = create_pull 'master', 'non_conflicts', @hidden_project.owner, @hidden_project
|
||||||
|
|
||||||
|
@own_hidden_project = FactoryGirl.create(:project_with_commit, :owner => @project.owner)
|
||||||
|
@own_hidden_project.update_column :visibility, 'hidden'
|
||||||
|
@own_hidden_pull = create_pull 'master', 'non_conflicts', @own_hidden_project.owner, @own_hidden_project
|
||||||
|
@own_hidden_pull.issue.update_column :assignee_id, @project.owner.id
|
||||||
|
|
||||||
|
@membered_project = FactoryGirl.create(:project_with_commit)
|
||||||
|
@membered_pull = create_pull 'master', 'non_conflicts', @membered_project.owner, @membered_project
|
||||||
|
@membered_project.relations.create(:role => 'reader', :actor => @pull.user)
|
||||||
|
|
||||||
@create_params = {:pull_request => {:title => 'title', :body => 'body',
|
@create_params = {:pull_request => {:title => 'title', :body => 'body',
|
||||||
:from_ref => 'conflicts', :to_ref => 'master'},
|
:from_ref => 'conflicts', :to_ref => 'master'},
|
||||||
:project_id => @project.id, :format => :json}
|
:project_id => @project.id, :format => :json}
|
||||||
|
|
||||||
|
@update_params = {:pull_request => {:title => 'new title'},
|
||||||
|
:project_id => @project.id, :id => @pull.serial_id, :format => :json}
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'read and accessible abilities' do
|
context 'read and accessible abilities' do
|
||||||
|
@ -37,39 +57,25 @@ describe Api::V1::PullRequestsController do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'can show pull request in open project' do
|
it 'can show pull request in open project' do
|
||||||
another_project = FactoryGirl.create(:project_with_commit)
|
get :show, :project_id => @another_project.id, :id => @another_pull.serial_id, :format => :json
|
||||||
pull = create_pull 'master', 'non_conflicts', another_project.owner, another_project
|
|
||||||
get :show, :project_id => another_project.id, :id => pull.serial_id, :format => :json
|
|
||||||
response.should be_success
|
response.should be_success
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'can show pull request in own hidden project' do
|
it 'can show pull request in own hidden project' do
|
||||||
@project.update_column :visibility, 'hidden'
|
get :show, :project_id => @own_hidden_project.id, :id => @own_hidden_pull.serial_id, :format => :json
|
||||||
get :show, :project_id => @project.id, :id => @pull.serial_id, :format => :json
|
|
||||||
response.should be_success
|
response.should be_success
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'cant show pull request in hidden project' do
|
it 'cant show pull request in hidden project' do
|
||||||
another_project = FactoryGirl.create(:project_with_commit)
|
get :show, :project_id => @hidden_project.id, :id => @hidden_pull.serial_id, :format => :json
|
||||||
pull = create_pull 'master', 'non_conflicts', another_project.owner, another_project
|
|
||||||
another_project.update_column :visibility, 'hidden'
|
|
||||||
|
|
||||||
get :show, :project_id => another_project.id, :id => pull.serial_id, :format => :json
|
|
||||||
response.status.should == 403
|
response.status.should == 403
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should return three pull requests' do
|
it 'should return three pull requests' do
|
||||||
own_hidden_project = FactoryGirl.create(:project_with_commit, :owner => @project.owner)
|
|
||||||
own_hidden_project.update_column :visibility, 'hidden'
|
|
||||||
own_hidden_pull = create_pull 'master', 'non_conflicts', own_hidden_project.owner, own_hidden_project
|
|
||||||
membered_project = FactoryGirl.create(:project_with_commit)
|
|
||||||
membered_pull = create_pull 'master', 'non_conflicts', membered_project.owner, membered_project
|
|
||||||
membered_project.relations.create(:role => 'reader', :actor => @pull.user)
|
|
||||||
|
|
||||||
get :all_index, :filter => 'all', :format => :json
|
get :all_index, :filter => 'all', :format => :json
|
||||||
assigns[:pulls].should include(@pull)
|
assigns[:pulls].should include(@pull)
|
||||||
assigns[:pulls].should include(own_hidden_pull)
|
assigns[:pulls].should include(@own_hidden_pull)
|
||||||
assigns[:pulls].should include(membered_pull)
|
assigns[:pulls].should include(@membered_pull)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should render right template for all index action' do
|
it 'should render right template for all index action' do
|
||||||
|
@ -78,13 +84,8 @@ describe Api::V1::PullRequestsController do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should return only assigned pull request' do
|
it 'should return only assigned pull request' do
|
||||||
own_hidden_project = FactoryGirl.create(:project_with_commit, :owner => @project.owner)
|
|
||||||
own_hidden_project.update_column :visibility, 'hidden'
|
|
||||||
own_hidden_pull = create_pull 'master', 'non_conflicts', own_hidden_project.owner, own_hidden_project
|
|
||||||
own_hidden_pull.issue.update_column :assignee_id, @pull.user
|
|
||||||
|
|
||||||
get :user_index, :format => :json
|
get :user_index, :format => :json
|
||||||
assigns[:pulls].should include(own_hidden_pull)
|
assigns[:pulls].should include(@own_hidden_pull)
|
||||||
assigns[:pulls].count.should == 1
|
assigns[:pulls].count.should == 1
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -92,6 +93,23 @@ describe Api::V1::PullRequestsController do
|
||||||
get :user_index, :format => :json
|
get :user_index, :format => :json
|
||||||
response.should render_template('api/v1/pull_requests/index')
|
response.should render_template('api/v1/pull_requests/index')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
%w(commits files).each do |action|
|
||||||
|
it "can show pull request #{action} in own project" do
|
||||||
|
get action, :project_id => @project.id, :id => @pull.serial_id, :format => :json
|
||||||
|
response.should be_success
|
||||||
|
end
|
||||||
|
|
||||||
|
it "should render right template for commits action" do
|
||||||
|
get action, :project_id => @project.id, :id => @pull.serial_id, :format => :json
|
||||||
|
response.should render_template("api/v1/pull_requests/#{action}")
|
||||||
|
end
|
||||||
|
|
||||||
|
it "can't show pull request #{action} in hidden project" do
|
||||||
|
get action, :project_id => @hidden_project.id, :id => @hidden_pull.serial_id, :format => :json
|
||||||
|
response.should_not be_success
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'for anonymous user' do
|
context 'for anonymous user' do
|
||||||
|
@ -110,6 +128,23 @@ describe Api::V1::PullRequestsController do
|
||||||
get :all_index, :filter => 'all', :format => :json
|
get :all_index, :filter => 'all', :format => :json
|
||||||
response.status.should == 401
|
response.status.should == 401
|
||||||
end
|
end
|
||||||
|
|
||||||
|
%w(commits files).each do |action|
|
||||||
|
it "can show pull request #{action} in project" do
|
||||||
|
get action, :project_id => @project.id, :id => @pull.serial_id, :format => :json
|
||||||
|
response.should be_success
|
||||||
|
end
|
||||||
|
|
||||||
|
it "should render right template for commits action" do
|
||||||
|
get action, :project_id => @project.id, :id => @pull.serial_id, :format => :json
|
||||||
|
response.should render_template("api/v1/pull_requests/#{action}")
|
||||||
|
end
|
||||||
|
|
||||||
|
it "can't show pull request #{action} in hidden project" do
|
||||||
|
get action, :project_id => @hidden_project.id, :id => @hidden_pull.serial_id, :format => :json
|
||||||
|
response.should_not be_success
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -124,9 +159,7 @@ describe Api::V1::PullRequestsController do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'can create pull request in own hidden project' do
|
it 'can create pull request in own hidden project' do
|
||||||
own_hidden_project = FactoryGirl.create(:project_with_commit, :owner => @project.owner)
|
lambda { post :create, @create_params.merge(:project_id => @own_hidden_project.id) }.should
|
||||||
own_hidden_project.update_column :visibility, 'hidden'
|
|
||||||
lambda { post :create, @create_params.merge(:project_id => own_hidden_project.id) }.should
|
|
||||||
change{ PullRequest.count }.by(1)
|
change{ PullRequest.count }.by(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -136,12 +169,8 @@ describe Api::V1::PullRequestsController do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'cant create pull request in hidden project' do
|
it 'cant create pull request in hidden project' do
|
||||||
hidden_project = FactoryGirl.create(:project_with_commit)
|
lambda { post :create, @create_params.merge(:project_id => @hidden_project.id) }.should
|
||||||
hidden_project.update_column :visibility, 'hidden'
|
|
||||||
|
|
||||||
lambda { post :create, @create_params.merge(:project_id => hidden_project.id) }.should
|
|
||||||
change{ PullRequest.count }.by(0)
|
change{ PullRequest.count }.by(0)
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -151,11 +180,90 @@ describe Api::V1::PullRequestsController do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'cant create pull request in hidden project', :anonymous_access => true do
|
it 'cant create pull request in hidden project', :anonymous_access => true do
|
||||||
hidden_project = FactoryGirl.create(:project_with_commit)
|
lambda { post :create, @create_params.merge(:project_id => @hidden_project.id) }.should
|
||||||
hidden_project.update_column :visibility, 'hidden'
|
|
||||||
lambda { post :create, @create_params.merge(:project_id => hidden_project.id) }.should
|
|
||||||
change{ PullRequest.count }.by(0)
|
change{ PullRequest.count }.by(0)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'update accessibility' do
|
||||||
|
context 'for user' do
|
||||||
|
before(:each) do
|
||||||
|
http_login(@project.owner)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'can update pull request in own project' do
|
||||||
|
put :update, @update_params
|
||||||
|
@pull.reload.title.should == 'new title'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'can update pull request in own hidden project' do
|
||||||
|
put :update, @update_params.merge(:project_id => @own_hidden_project.id, :id => @own_hidden_pull.serial_id)
|
||||||
|
@own_hidden_pull.reload.title.should == 'new title'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'cant update pull request in open project' do
|
||||||
|
put :update, @update_params.merge(:project_id => @another_project.id, :id => @another_pull.serial_id)
|
||||||
|
@another_pull.reload.title.should_not == 'new title'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'cant update pull request in hidden project' do
|
||||||
|
put :update, @update_params.merge(:project_id => @hidden_project.id, :id => @hidden_pull.serial_id)
|
||||||
|
@hidden_pull.reload.title.should_not == 'title'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'can merge pull request in own project' do
|
||||||
|
put :merge, :project_id => @project.id, :id => @pull.serial_id, :format => :json
|
||||||
|
@pull.reload.status.should == 'merged'
|
||||||
|
response.should be_success
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'can merge pull request in own hidden project' do
|
||||||
|
put :merge, :project_id => @own_hidden_project.id, :id => @own_hidden_pull.serial_id, :format => :json
|
||||||
|
@own_hidden_pull.reload.status.should == 'merged'
|
||||||
|
response.should be_success
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'cant merge pull request in open project' do
|
||||||
|
put :merge, :project_id => @another_project.id, :id => @another_pull.serial_id, :format => :json
|
||||||
|
@another_pull.reload.status.should == 'ready'
|
||||||
|
response.status.should == 403
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'cant merge pull request in hidden project' do
|
||||||
|
put :merge, :project_id => @hidden_project.id, :id => @hidden_pull.serial_id, :format => :json
|
||||||
|
@hidden_pull.reload.status.should == 'ready'
|
||||||
|
response.status.should == 403
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'for anonymous user' do
|
||||||
|
it 'cant update pull request in project', :anonymous_access => true do
|
||||||
|
put :update, @update_params
|
||||||
|
response.status.should == 401
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'cant update pull request in hidden project', :anonymous_access => true do
|
||||||
|
put :update, @update_params.merge(:project_id => @hidden_project.id, :id => @hidden_pull.serial_id)
|
||||||
|
response.status.should == 401
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'cant merge pull request in open project' do
|
||||||
|
put :merge, :project_id => @another_project.id, :id => @another_pull.serial_id, :format => :json
|
||||||
|
@another_pull.reload.status.should == 'ready'
|
||||||
|
response.status.should == 401
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'cant merge pull request in hidden project' do
|
||||||
|
put :merge, :project_id => @hidden_project.id, :id => @hidden_pull.serial_id, :format => :json
|
||||||
|
@hidden_pull.reload.status.should == 'ready'
|
||||||
|
response.status.should == 401
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
after(:all) do
|
||||||
|
User.destroy_all
|
||||||
|
Platform.destroy_all
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue