Commit 38ab0d68 authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

Make rubocop happy

parent 045eb28e
...@@ -78,7 +78,7 @@ module IssuableActions ...@@ -78,7 +78,7 @@ module IssuableActions
:weight, :weight,
label_ids: [], label_ids: [],
add_label_ids: [], add_label_ids: [],
remove_label_ids: [], remove_label_ids: []
] ]
if resource_name == 'issue' if resource_name == 'issue'
......
...@@ -26,7 +26,7 @@ module BoardsHelper ...@@ -26,7 +26,7 @@ module BoardsHelper
board = @board || @boards.first board = @board || @boards.first
board.to_json( board.to_json(
only: [:id, :name, :milestone_id], only: [:id, :name, :milestone_id]
) )
end end
......
...@@ -35,7 +35,7 @@ module EE ...@@ -35,7 +35,7 @@ module EE
only: [:id, :name, :milestone_id, :assignee_id, :weight, :label_ids], only: [:id, :name, :milestone_id, :assignee_id, :weight, :label_ids],
include: { include: {
milestone: { only: [:id, :title, :name] }, milestone: { only: [:id, :title, :name] },
assignee: { only: [:id, :name, :username ], methods: [:avatar_url] }, assignee: { only: [:id, :name, :username], methods: [:avatar_url] },
labels: { only: [:title, :color, :id] } labels: { only: [:title, :color, :id] }
} }
) )
......
...@@ -237,9 +237,6 @@ describe 'issue board config', :js do ...@@ -237,9 +237,6 @@ describe 'issue board config', :js do
end end
end end
# context 'author' do
# end
context 'weight' do context 'weight' do
let!(:issue_weight_1) { create(:issue, project: project, weight: 1) } let!(:issue_weight_1) { create(:issue, project: project, weight: 1) }
...@@ -256,13 +253,6 @@ describe 'issue board config', :js do ...@@ -256,13 +253,6 @@ describe 'issue board config', :js do
expect(page).to have_selector('.card', count: 4) expect(page).to have_selector('.card', count: 4)
end end
# it 'sets board to No weight' do
# TODO
# update_board_weight('No weight')
# expect(page).to have_selector('.card', count: 3)
# end
it 'does not display weight in search hint' do it 'does not display weight in search hint' do
update_board_weight(1) update_board_weight(1)
filtered_search.click filtered_search.click
...@@ -378,6 +368,6 @@ describe 'issue board config', :js do ...@@ -378,6 +368,6 @@ describe 'issue board config', :js do
click_button 'Save' click_button 'Save'
expect(page).to have_selector('.board-list-loading') expect(page).to have_selector('.board-list-loading')
expect(page).to_not have_selector('.board-list-loading') expect(page).not_to have_selector('.board-list-loading')
end end
end end
...@@ -32,8 +32,11 @@ describe API::Boards do ...@@ -32,8 +32,11 @@ describe API::Boards do
set(:board_label) { create(:label, project: project) } set(:board_label) { create(:label, project: project) }
set(:board) do set(:board) do
create(:board, project: project, milestone: milestone, assignee: user, create(:board, project: project,
label_ids: [board_label.id], lists: [dev_list, test_list]) milestone: milestone,
assignee: user,
label_ids: [board_label.id],
lists: [dev_list, test_list])
end end
before do before do
......
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