summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-08-03 12:09:03 -0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-08-17 12:58:58 -0300
commit9e5a305f18377c9fbe74e44dcef7606ab109291c (patch)
tree2a9a2bc4f69a2ff93264bdfb69640f5a8e3ed800 /spec/controllers
parent2c00d5928c69744138c9a411c533ff3a098f2804 (diff)
downloadgitlab-ce-9e5a305f18377c9fbe74e44dcef7606ab109291c.tar.gz
Use zero-based positions on issues board services
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/board_issues_controller_spec.rb4
-rw-r--r--spec/controllers/projects/board_lists_controller_spec.rb16
2 files changed, 10 insertions, 10 deletions
diff --git a/spec/controllers/projects/board_issues_controller_spec.rb b/spec/controllers/projects/board_issues_controller_spec.rb
index c7fccfbce6c..6b4fb382b16 100644
--- a/spec/controllers/projects/board_issues_controller_spec.rb
+++ b/spec/controllers/projects/board_issues_controller_spec.rb
@@ -7,8 +7,8 @@ describe Projects::BoardIssuesController do
let(:planning) { create(:label, project: project, name: 'Planning') }
let(:development) { create(:label, project: project, name: 'Development') }
- let!(:list1) { create(:list, board: project.board, label: planning, position: 1) }
- let!(:list2) { create(:list, board: project.board, label: development, position: 2) }
+ let!(:list1) { create(:list, board: project.board, label: planning, position: 0) }
+ let!(:list2) { create(:list, board: project.board, label: development, position: 1) }
before do
project.team << [user, :master]
diff --git a/spec/controllers/projects/board_lists_controller_spec.rb b/spec/controllers/projects/board_lists_controller_spec.rb
index 41d0432e14f..cf8801ca4f6 100644
--- a/spec/controllers/projects/board_lists_controller_spec.rb
+++ b/spec/controllers/projects/board_lists_controller_spec.rb
@@ -47,20 +47,20 @@ describe Projects::BoardListsController do
end
describe 'PATCH #update' do
- let!(:planning) { create(:list, board: board, position: 1) }
- let!(:development) { create(:list, board: board, position: 2) }
+ let!(:planning) { create(:list, board: board, position: 0) }
+ let!(:development) { create(:list, board: board, position: 1) }
context 'with valid position' do
it 'returns a successful 200 response' do
- move list: planning, position: 2
+ move list: planning, position: 1
expect(response).to have_http_status(200)
end
it 'moves the list to the desired position' do
- move list: planning, position: 2
+ move list: planning, position: 1
- expect(planning.reload.position).to eq 2
+ expect(planning.reload.position).to eq 1
end
end
@@ -74,7 +74,7 @@ describe Projects::BoardListsController do
context 'with invalid list id' do
it 'returns a not found 404 response' do
- move list: 999, position: 2
+ move list: 999, position: 1
expect(response).to have_http_status(404)
end
@@ -91,7 +91,7 @@ describe Projects::BoardListsController do
describe 'DELETE #destroy' do
context 'with valid list id' do
- let!(:planning) { create(:list, board: board, position: 1) }
+ let!(:planning) { create(:list, board: board, position: 0) }
it 'returns a successful 200 response' do
remove_board_list list: planning
@@ -112,7 +112,7 @@ describe Projects::BoardListsController do
end
end
- def remove_board_list(list)
+ def remove_board_list(list:)
delete :destroy, namespace_id: project.namespace.to_param,
project_id: project.to_param,
id: list.to_param,