From 9c4ee8ee64dcba297de13d453f6eea18304d50db Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Thu, 4 May 2017 13:55:13 -0500 Subject: [PATCH] Fix eslint and rubocop --- .../protected_branches/protected_branch_access_dropdown.js | 3 +-- app/assets/javascripts/users_select.js | 2 +- spec/features/issues/filtered_search/filter_issues_spec.rb | 1 - spec/javascripts/boards/board_card_spec.js | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js b/app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js index 1266d70f073..42993a252c3 100644 --- a/app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js +++ b/app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js @@ -20,8 +20,7 @@ } }, clicked(opts) { - const { $el, e } = opts; - const item = opts.selectedObj; + const { e } = opts; e.preventDefault(); onSelect(); diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index 64171e491e5..2dcaa24e93a 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -391,7 +391,7 @@ import eventHub from './sidebar/event_hub'; if ($dropdown.hasClass('js-filter-bulk-update') || $dropdown.hasClass('js-issuable-form-dropdown')) { e.preventDefault(); - let isSelecting = (user.id !== selectedId); + const isSelecting = (user.id !== selectedId); selectedId = isSelecting ? user.id : selectedIdDefault; if (selectedId === gon.current_user_id) { diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb index ece62c8da41..a8f4e2d7e10 100644 --- a/spec/features/issues/filtered_search/filter_issues_spec.rb +++ b/spec/features/issues/filtered_search/filter_issues_spec.rb @@ -54,7 +54,6 @@ describe 'Filter issues', js: true, feature: true do create(:issue, project: project, title: "issue by assignee", milestone: milestone, author: user, assignees: [user]) create(:issue, project: project, title: "issue by assignee with searchTerm", milestone: milestone, author: user, assignees: [user]) - issue = create(:issue, title: "Bug 2", project: project, diff --git a/spec/javascripts/boards/board_card_spec.js b/spec/javascripts/boards/board_card_spec.js index de072e7e470..2064ca2632b 100644 --- a/spec/javascripts/boards/board_card_spec.js +++ b/spec/javascripts/boards/board_card_spec.js @@ -6,7 +6,7 @@ /* global BoardService */ import Vue from 'vue'; -import '~/boards/models/user'; +import '~/boards/models/assignee'; require('~/boards/models/list'); require('~/boards/models/label');