Add latest changes from gitlab-org/gitlab@master

4 files changed, 3 insertions, 18 deletions

diff --git a/spec/helpers/clusters_helper_spec.rb b/spec/helpers/clusters_helper_spec.rb
index 6b08b6515cf..8c738141063 100644
--- a/spec/helpers/clusters_helper_spec.rb
+++ b/spec/helpers/clusters_helper_spec.rb
@@ -131,7 +131,7 @@ RSpec.describe ClustersHelper do
     context 'other values' do
       let(:cluster_type) { 'not_supported' }
 
-      it 'Diplays generic cluster and reports error' do
+      it 'diplays generic cluster and reports error' do
         expect(Gitlab::ErrorTracking).to receive(:track_and_raise_for_dev_exception).with(
           an_instance_of(ArgumentError),
           cluster_error: { error: 'Cluster Type Missing', cluster_type: 'not_supported' }
diff --git a/spec/helpers/emails_helper_spec.rb b/spec/helpers/emails_helper_spec.rb
index ef8b342a3f6..58ed5901d45 100644
--- a/spec/helpers/emails_helper_spec.rb
+++ b/spec/helpers/emails_helper_spec.rb
@@ -296,7 +296,7 @@ RSpec.describe EmailsHelper do
     end
 
     with_them do
-      it 'Produces the right List-Id' do
+      it 'produces the right List-Id' do
         project = double("project")
         allow(project).to receive(:full_path).and_return(full_path)
         allow(project).to receive(:id).and_return(12345)
diff --git a/spec/helpers/icons_helper_spec.rb b/spec/helpers/icons_helper_spec.rb
index 357ca0afe46..4784d0aff26 100644
--- a/spec/helpers/icons_helper_spec.rb
+++ b/spec/helpers/icons_helper_spec.rb
@@ -5,21 +5,6 @@ require 'spec_helper'
 RSpec.describe IconsHelper do
   let(:icons_path) { ActionController::Base.helpers.image_path("icons.svg") }
 
-  describe 'icon' do
-    it 'returns aria-hidden by default' do
-      star = icon('star')
-
-      expect(star['aria-hidden']).to eq 'aria-hidden'
-    end
-
-    it 'does not return aria-hidden if aria-label is set' do
-      up = icon('up', 'aria-label' => 'up')
-
-      expect(up['aria-hidden']).to be_nil
-      expect(up['aria-label']).to eq 'aria-label'
-    end
-  end
-
   describe 'sprite_icon_path' do
     it 'returns relative path' do
       expect(sprite_icon_path).to eq(icons_path)
diff --git a/spec/helpers/issuables_helper_spec.rb b/spec/helpers/issuables_helper_spec.rb
index 5b7dcd46d27..57845904d32 100644
--- a/spec/helpers/issuables_helper_spec.rb
+++ b/spec/helpers/issuables_helper_spec.rb
@@ -218,7 +218,7 @@ RSpec.describe IssuablesHelper do
         assign(:project, issue.project)
       end
 
-      it 'sets sentryIssueIdentifier to nil with no sentry issue ' do
+      it 'sets sentryIssueIdentifier to nil with no sentry issue' do
         expect(helper.issuable_initial_data(issue)[:sentryIssueIdentifier])
           .to be_nil
       end