Added issuables_helper.js, tidied up droplab-dropdown JS, fixed filtered search specs

2 files changed, 33 insertions, 33 deletions

diff --git a/spec/features/issuables/close_reopen_report_toggle_spec.rb b/spec/features/issuables/close_reopen_report_toggle_spec.rb
index 38e8ca3eb36..361f14e4366 100644
--- a/spec/features/issuables/close_reopen_report_toggle_spec.rb
+++ b/spec/features/issuables/close_reopen_report_toggle_spec.rb
@@ -1,45 +1,45 @@
 require 'spec_helper'
 
-shared_examples 'an issuable close/reopen/report toggle' do
-  let(:container) { find('.issuable-close-dropdown') }
-  let(:human_model_name) { issuable.model_name.human.downcase }
+describe 'Issuables Close/Reopen/Report toggle', :feature do
+  let(:user) { create(:user) }
 
-  it 'shows toggle' do
-    expect(page).to have_link("Close #{human_model_name}")
-    expect(page).to have_selector('.issuable-close-dropdown')
-  end
+  shared_examples 'an issuable close/reopen/report toggle' do
+    let(:container) { find('.issuable-close-dropdown') }
+    let(:human_model_name) { issuable.model_name.human.downcase }
 
-  it 'opens a dropdown when toggle is clicked' do
-    container.find('.dropdown-toggle').click
-
-    expect(container).to have_selector('.dropdown-menu')
-    expect(container).to have_content("Close #{human_model_name}")
-    expect(container).to have_content('Report abuse')
-    expect(container).to have_content("Report #{human_model_name.pluralize} that are abusive, inappropriate or spam.")
-    expect(container).to have_selector('.close-item.droplab-item-selected')
-    expect(container).to have_selector('.report-item')
-    expect(container).not_to have_selector('.report-item.droplab-item-selected')
-    expect(container).not_to have_selector('.reopen-item')
-  end
+    it 'shows toggle' do
+      expect(page).to have_link("Close #{human_model_name}")
+      expect(page).to have_selector('.issuable-close-dropdown')
+    end
+
+    it 'opens a dropdown when toggle is clicked' do
+      container.find('.dropdown-toggle').click
+
+      expect(container).to have_selector('.dropdown-menu')
+      expect(container).to have_content("Close #{human_model_name}")
+      expect(container).to have_content('Report abuse')
+      expect(container).to have_content("Report #{human_model_name.pluralize} that are abusive, inappropriate or spam.")
+      expect(container).to have_selector('.close-item.droplab-item-selected')
+      expect(container).to have_selector('.report-item')
+      expect(container).not_to have_selector('.report-item.droplab-item-selected')
+      expect(container).not_to have_selector('.reopen-item')
+    end
 
-  it 'changes the button when an item is selected' do
-    button = container.find('.issuable-close-button')
+    it 'changes the button when an item is selected' do
+      button = container.find('.issuable-close-button')
 
-    container.find('.dropdown-toggle').click
-    container.find('.report-item').click
+      container.find('.dropdown-toggle').click
+      container.find('.report-item').click
 
-    expect(container).not_to have_selector('.dropdown-menu')
-    expect(button).to have_content('Report abuse')
+      expect(container).not_to have_selector('.dropdown-menu')
+      expect(button).to have_content('Report abuse')
 
-    container.find('.dropdown-toggle').click
-    container.find('.close-item').click
+      container.find('.dropdown-toggle').click
+      container.find('.close-item').click
 
-    expect(button).to have_content("Close #{human_model_name}")
+      expect(button).to have_content("Close #{human_model_name}")
+    end
   end
-end
-
-describe 'Issuables Close/Reopen/Report toggle', :feature do
-  let(:user) { create(:user) }
 
   context 'on an issue' do
     let(:project) { create(:empty_project) }
diff --git a/spec/features/issues/filtered_search/visual_tokens_spec.rb b/spec/features/issues/filtered_search/visual_tokens_spec.rb
index 08360bfa641..e40cfd09601 100644
--- a/spec/features/issues/filtered_search/visual_tokens_spec.rb
+++ b/spec/features/issues/filtered_search/visual_tokens_spec.rb
@@ -133,7 +133,7 @@ describe 'Visual tokens', js: true, feature: true do
   describe 'editing milestone token' do
     before do
       input_filtered_search('milestone:%10.0 author:none', submit: false)
-      first('.tokens-container .filtered-search-token').double_click
+      first('.tokens-container .filtered-search-token').click
       first('#js-dropdown-milestone .filter-dropdown .filter-dropdown-item')
     end