Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showing-pipeline

* upstream/master: (50 commits)
  Increased vertical alignment of labels for issues in lists
  Changed file name Updated spec HAML
  Changed tests to use JS tests
  Addressed feedback
  Made logic simpler by moving away from underscorejs
  Added tooltip to label value in collapsed sidebar
  Add play icon SVG
  Have hover color of builds span full width
  Fix alignment of icon on commits page
  Change sleep to wait_for_ajax
  Added tests
  Destroy branch delete tooltip when row is removed
  Move and improvement comment in pipeline fixtures
  Fix notification_service argument error of declined invitation emails
  Update contribution acceptance criteria with tests requirements
  Fixed keyboard shortcuts not working on issue boards
  Hides tooltip when dragging Fixes issue with cursor not changing when dragging
  Hides tooltips when dragging issues
  Add a spec testing a second side effect of `Repository#merge`.
  drop execute bit
  ...

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/helpers/issuables_helper_spec.rb b/spec/helpers/issuables_helper_spec.rb
new file mode 100644
index 00000000000..2dd2eab0524
--- /dev/null
+++ b/spec/helpers/issuables_helper_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe IssuablesHelper do 
+  let(:label)  { build_stubbed(:label) }
+  let(:label2) { build_stubbed(:label) }
+
+  context 'label tooltip' do
+    it 'returns label text' do
+      expect(issuable_labels_tooltip([label])).to eq(label.title)
+    end
+
+    it 'returns label text' do
+      expect(issuable_labels_tooltip([label, label2], limit: 1)).to eq("#{label.title}, and 1 more")
+    end
+  end
+end