summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorHan Loong Liauw <hanloongliauw@gmail.com>2015-10-14 09:04:22 +1100
committerHan Loong Liauw <hanloongliauw@gmail.com>2015-10-14 20:19:41 +1100
commit0bea5ced8bf4c9306f8f8e912313731a43d16f4c (patch)
tree59c92b92d21fc88d14c4e838c613b0caae38de79 /spec/controllers
parent520d85099ff34882d865c3fa885a7f3335b41cb2 (diff)
downloadgitlab-ce-0bea5ced8bf4c9306f8f8e912313731a43d16f4c.tar.gz
Made suggested content changes based on MR Review
Changed the authentication method for removing fork through API Reflected changes to new auth method in API specs
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects_controller_spec.rb26
1 files changed, 16 insertions, 10 deletions
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 626b56cc789..e963e913512 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -72,9 +72,12 @@ describe ProjectsController do
context 'with forked project' do
let(:project_fork) { create(:project, namespace: user.namespace) }
- it 'should remove fork from project' do
+ before do
create(:forked_project_link, forked_to_project: project_fork)
- put(:remove_fork,
+ end
+
+ it 'should remove fork from project' do
+ delete(:remove_fork,
namespace_id: project_fork.namespace.to_param,
id: project_fork.to_param, format: :js)
@@ -84,19 +87,22 @@ describe ProjectsController do
end
end
- it 'should do nothing if project was not forked' do
- unforked_project = create(:project, namespace: user.namespace)
- put(:remove_fork,
- namespace_id: unforked_project.namespace.to_param,
- id: unforked_project.to_param, format: :js)
+ context 'when project not forked' do
+ let(:unforked_project) { create(:project, namespace: user.namespace) }
- expect(flash[:notice]).to be_nil
- expect(response).to render_template(:remove_fork)
+ it 'should do nothing if project was not forked' do
+ delete(:remove_fork,
+ namespace_id: unforked_project.namespace.to_param,
+ id: unforked_project.to_param, format: :js)
+
+ expect(flash[:notice]).to be_nil
+ expect(response).to render_template(:remove_fork)
+ end
end
end
it "does nothing if user is not signed in" do
- put(:remove_fork,
+ delete(:remove_fork,
namespace_id: project.namespace.to_param,
id: project.to_param, format: :js)
expect(response.status).to eq(401)