Commit e462e122 authored by Sean McGivern's avatar Sean McGivern

Tidy up spec action names

parent 87aba17e
...@@ -12,7 +12,7 @@ describe Projects::CommitController do ...@@ -12,7 +12,7 @@ describe Projects::CommitController do
project.team << [user, :master] project.team << [user, :master]
end end
describe 'GET #show' do describe 'GET show' do
render_views render_views
def go(extra_params = {}) def go(extra_params = {})
...@@ -141,7 +141,7 @@ describe Projects::CommitController do ...@@ -141,7 +141,7 @@ describe Projects::CommitController do
end end
end end
describe "#branches" do describe "GET branches" do
it "contains branch and tags information" do it "contains branch and tags information" do
get(:branches, get(:branches,
namespace_id: project.namespace.to_param, namespace_id: project.namespace.to_param,
...@@ -153,7 +153,7 @@ describe Projects::CommitController do ...@@ -153,7 +153,7 @@ describe Projects::CommitController do
end end
end end
describe '#revert' do describe 'POST revert' do
context 'when target branch is not provided' do context 'when target branch is not provided' do
it 'should render the 404 page' do it 'should render the 404 page' do
post(:revert, post(:revert,
...@@ -202,7 +202,7 @@ describe Projects::CommitController do ...@@ -202,7 +202,7 @@ describe Projects::CommitController do
end end
end end
describe '#cherry_pick' do describe 'POST cherry_pick' do
context 'when target branch is not provided' do context 'when target branch is not provided' do
it 'should render the 404 page' do it 'should render the 404 page' do
post(:cherry_pick, post(:cherry_pick,
...@@ -251,7 +251,7 @@ describe Projects::CommitController do ...@@ -251,7 +251,7 @@ describe Projects::CommitController do
end end
end end
describe 'GET #diff_for_path' do describe 'GET diff_for_path' do
def diff_for_path(extra_params = {}) def diff_for_path(extra_params = {})
params = { params = {
namespace_id: project.namespace.to_param, namespace_id: project.namespace.to_param,
......
...@@ -65,7 +65,7 @@ describe Projects::CompareController do ...@@ -65,7 +65,7 @@ describe Projects::CompareController do
end end
end end
describe 'GET #diff_for_path' do describe 'GET diff_for_path' do
def diff_for_path(extra_params = {}) def diff_for_path(extra_params = {})
params = { params = {
namespace_id: project.namespace.to_param, namespace_id: project.namespace.to_param,
......
...@@ -10,7 +10,7 @@ describe Projects::MergeRequestsController do ...@@ -10,7 +10,7 @@ describe Projects::MergeRequestsController do
project.team << [user, :master] project.team << [user, :master]
end end
describe '#new' do describe 'GET new' do
context 'merge request that removes a submodule' do context 'merge request that removes a submodule' do
render_views render_views
...@@ -34,7 +34,7 @@ describe Projects::MergeRequestsController do ...@@ -34,7 +34,7 @@ describe Projects::MergeRequestsController do
end end
end end
describe "#show" do describe "GET show" do
shared_examples "export merge as" do |format| shared_examples "export merge as" do |format|
it "should generally work" do it "should generally work" do
get(:show, get(:show,
...@@ -108,7 +108,7 @@ describe Projects::MergeRequestsController do ...@@ -108,7 +108,7 @@ describe Projects::MergeRequestsController do
end end
end end
describe 'GET #index' do describe 'GET index' do
def get_merge_requests def get_merge_requests
get :index, get :index,
namespace_id: project.namespace.to_param, namespace_id: project.namespace.to_param,
...@@ -140,7 +140,7 @@ describe Projects::MergeRequestsController do ...@@ -140,7 +140,7 @@ describe Projects::MergeRequestsController do
end end
end end
describe 'PUT #update' do describe 'PUT update' do
context 'there is no source project' do context 'there is no source project' do
let(:project) { create(:project) } let(:project) { create(:project) }
let(:fork_project) { create(:forked_project_with_submodules) } let(:fork_project) { create(:forked_project_with_submodules) }
...@@ -168,7 +168,7 @@ describe Projects::MergeRequestsController do ...@@ -168,7 +168,7 @@ describe Projects::MergeRequestsController do
end end
end end
describe 'POST #merge' do describe 'POST merge' do
let(:base_params) do let(:base_params) do
{ {
namespace_id: project.namespace.path, namespace_id: project.namespace.path,
...@@ -266,7 +266,7 @@ describe Projects::MergeRequestsController do ...@@ -266,7 +266,7 @@ describe Projects::MergeRequestsController do
end end
end end
describe "DELETE #destroy" do describe "DELETE destroy" do
it "denies access to users unless they're admin or project owner" do it "denies access to users unless they're admin or project owner" do
delete :destroy, namespace_id: project.namespace.path, project_id: project.path, id: merge_request.iid delete :destroy, namespace_id: project.namespace.path, project_id: project.path, id: merge_request.iid
...@@ -289,7 +289,7 @@ describe Projects::MergeRequestsController do ...@@ -289,7 +289,7 @@ describe Projects::MergeRequestsController do
end end
end end
describe 'GET #diffs' do describe 'GET diffs' do
def go(extra_params = {}) def go(extra_params = {})
params = { params = {
namespace_id: project.namespace.to_param, namespace_id: project.namespace.to_param,
...@@ -367,7 +367,7 @@ describe Projects::MergeRequestsController do ...@@ -367,7 +367,7 @@ describe Projects::MergeRequestsController do
end end
end end
describe 'GET #diff_for_path' do describe 'GET diff_for_path' do
def diff_for_path(extra_params = {}) def diff_for_path(extra_params = {})
params = { params = {
namespace_id: project.namespace.to_param, namespace_id: project.namespace.to_param,
......
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