Add latest changes from gitlab-org/gitlab@master

3 files changed, 36 insertions, 8 deletions

diff --git a/spec/features/merge_request/user_posts_diff_notes_spec.rb b/spec/features/merge_request/user_posts_diff_notes_spec.rb
index 103d126891e..19f82058be2 100644
--- a/spec/features/merge_request/user_posts_diff_notes_spec.rb
+++ b/spec/features/merge_request/user_posts_diff_notes_spec.rb
@@ -66,12 +66,7 @@ describe 'Merge request > User posts diff notes', :js do
     end
 
     context 'with a match line' do
-      it 'does not allow commenting on the left side' do
-        line_holder = find('.match', match: :first).find(:xpath, '..')
-        match_should_not_allow_commenting(line_holder)
-      end
-
-      it 'does not allow commenting on the right side' do
+      it 'does not allow commenting' do
         line_holder = find('.match', match: :first).find(:xpath, '..')
         match_should_not_allow_commenting(line_holder)
       end
diff --git a/spec/javascripts/vue_shared/components/stacked_progress_bar_spec.js b/spec/javascripts/vue_shared/components/stacked_progress_bar_spec.js
index f226dabb8a0..c062ee13231 100644
--- a/spec/javascripts/vue_shared/components/stacked_progress_bar_spec.js
+++ b/spec/javascripts/vue_shared/components/stacked_progress_bar_spec.js
@@ -68,8 +68,20 @@ describe('StackedProgressBarComponent', () => {
     });
 
     describe('getTooltip', () => {
-      it('returns label string based on label and count provided', () => {
-        expect(vm.getTooltip('Synced', 10)).toBe('Synced: 10');
+      describe('when hideTooltips is false', () => {
+        it('returns label string based on label and count provided', () => {
+          expect(vm.getTooltip('Synced', 10)).toBe('Synced: 10');
+        });
+      });
+
+      describe('when hideTooltips is true', () => {
+        beforeEach(() => {
+          vm = createComponent({ hideTooltips: true });
+        });
+
+        it('returns an empty string', () => {
+          expect(vm.getTooltip('Synced', 10)).toBe('');
+        });
       });
     });
   });
diff --git a/spec/lib/gitlab/asciidoc_spec.rb b/spec/lib/gitlab/asciidoc_spec.rb
index c7156a500d0..24528d79fa8 100644
--- a/spec/lib/gitlab/asciidoc_spec.rb
+++ b/spec/lib/gitlab/asciidoc_spec.rb
@@ -46,6 +46,27 @@ module Gitlab
         end
       end
 
+      context "with requested path" do
+        input = <<~ADOC
+          Document name: {docname}.
+        ADOC
+
+        it "ignores {docname} when not available" do
+          expect(render(input, {})).to include(input.strip)
+        end
+
+        [
+          ['/',                   '',       'root'],
+          ['README',              'README', 'just a filename'],
+          ['doc/api/',            '',       'a directory'],
+          ['doc/api/README.adoc', 'README', 'a complete path']
+        ].each do |path, basename, desc|
+          it "sets {docname} for #{desc}" do
+            expect(render(input, { requested_path: path })).to include(": #{basename}.")
+          end
+        end
+      end
+
       context "XSS" do
         items = {
           'link with extra attribute' => {