Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-for-issues-9-3

4 files changed, 148 insertions, 47 deletions

diff --git a/spec/helpers/avatars_helper_spec.rb b/spec/helpers/avatars_helper_spec.rb
index 6157abfe339..049475a5408 100644
--- a/spec/helpers/avatars_helper_spec.rb
+++ b/spec/helpers/avatars_helper_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe AvatarsHelper do
+  include ApplicationHelper
+
   let(:user) { create(:user) }
 
   describe '#user_avatar' do
@@ -18,4 +20,103 @@ describe AvatarsHelper do
       is_expected.to include(CGI.escapeHTML(user.avatar_url(size: 16)))
     end
   end
+
+  describe '#user_avatar_without_link' do
+    let(:options) { { user: user } }
+    subject { helper.user_avatar_without_link(options) }
+
+    it 'displays user avatar' do
+      is_expected.to eq image_tag(
+        avatar_icon(user, 16),
+        class: 'avatar has-tooltip s16 ',
+        alt: "#{user.name}'s avatar",
+        title: user.name,
+        data: { container: 'body' }
+      )
+    end
+
+    context 'with css_class parameter' do
+      let(:options) { { user: user, css_class: '.cat-pics' } }
+
+      it 'uses provided css_class' do
+        is_expected.to eq image_tag(
+          avatar_icon(user, 16),
+          class: "avatar has-tooltip s16 #{options[:css_class]}",
+          alt: "#{user.name}'s avatar",
+          title: user.name,
+          data: { container: 'body' }
+        )
+      end
+    end
+
+    context 'with lazy parameter' do
+      let(:options) { { user: user, lazy: true } }
+
+      it 'uses data-src instead of src' do
+        is_expected.to eq image_tag(
+          '',
+          class: 'avatar has-tooltip s16 ',
+          alt: "#{user.name}'s avatar",
+          title: user.name,
+          data: { container: 'body', src: avatar_icon(user, 16) }
+        )
+      end
+    end
+
+    context 'with size parameter' do
+      let(:options) { { user: user, size: 99 } }
+
+      it 'uses provided size' do
+        is_expected.to eq image_tag(
+          avatar_icon(user, options[:size]),
+          class: "avatar has-tooltip s#{options[:size]} ",
+          alt: "#{user.name}'s avatar",
+          title: user.name,
+          data: { container: 'body' }
+        )
+      end
+    end
+
+    context 'with url parameter' do
+      let(:options) { { user: user, url: '/over/the/rainbow.png' } }
+
+      it 'uses provided url' do
+        is_expected.to eq image_tag(
+          options[:url],
+          class: 'avatar has-tooltip s16 ',
+          alt: "#{user.name}'s avatar",
+          title: user.name,
+          data: { container: 'body' }
+        )
+      end
+    end
+
+    context 'with user_name parameter' do
+      let(:options) { { user_name: 'Tinky Winky', user_email: 'no@f.un' } }
+
+      context 'with user parameter' do
+        let(:options) { { user: user, user_name: 'Tinky Winky' } }
+
+        it 'prefers user parameter' do
+          is_expected.to eq image_tag(
+            avatar_icon(user, 16),
+            class: 'avatar has-tooltip s16 ',
+            alt: "#{user.name}'s avatar",
+            title: user.name,
+            data: { container: 'body' }
+          )
+        end
+      end
+
+      it 'uses user_name and user_email parameter if user is not present' do
+        is_expected.to eq image_tag(
+          avatar_icon(options[:user_email], 16),
+          class: 'avatar has-tooltip s16 ',
+          alt: "#{options[:user_name]}'s avatar",
+          title: options[:user_name],
+          data: { container: 'body' }
+        )
+      end
+    end
+  end
 end
diff --git a/spec/helpers/blob_helper_spec.rb b/spec/helpers/blob_helper_spec.rb
index 41b5df12522..bd3a3d24b84 100644
--- a/spec/helpers/blob_helper_spec.rb
+++ b/spec/helpers/blob_helper_spec.rb
@@ -118,8 +118,8 @@ describe BlobHelper do
       Class.new(BlobViewer::Base) do
         include BlobViewer::ServerSide
 
-        self.overridable_max_size = 1.megabyte
-        self.max_size = 5.megabytes
+        self.collapse_limit = 1.megabyte
+        self.size_limit = 5.megabytes
         self.type = :rich
       end
     end
@@ -129,7 +129,7 @@ describe BlobHelper do
 
     describe '#blob_render_error_reason' do
       context 'for error :too_large' do
-        context 'when the blob size is larger than the absolute max size' do
+        context 'when the blob size is larger than the absolute size limit' do
           let(:blob) { fake_blob(size: 10.megabytes) }
 
           it 'returns an error message' do
@@ -137,7 +137,7 @@ describe BlobHelper do
           end
         end
 
-        context 'when the blob size is larger than the max size' do
+        context 'when the blob size is larger than the size limit' do
           let(:blob) { fake_blob(size: 2.megabytes) }
 
           it 'returns an error message' do
@@ -168,21 +168,19 @@ describe BlobHelper do
         controller.params[:id] = File.join('master', blob.path)
       end
 
-      context 'for error :too_large' do
-        context 'when the max size can be overridden' do
-          let(:blob) { fake_blob(size: 2.megabytes) }
+      context 'for error :collapsed' do
+        let(:blob) { fake_blob(size: 2.megabytes) }
 
-          it 'includes a "load it anyway" link' do
-            expect(helper.blob_render_error_options(viewer)).to include(/load it anyway/)
-          end
+        it 'includes a "load it anyway" link' do
+          expect(helper.blob_render_error_options(viewer)).to include(/load it anyway/)
         end
+      end
 
-        context 'when the max size cannot be overridden' do
-          let(:blob) { fake_blob(size: 10.megabytes) }
+      context 'for error :too_large' do
+        let(:blob) { fake_blob(size: 10.megabytes) }
 
-          it 'does not include a "load it anyway" link' do
-            expect(helper.blob_render_error_options(viewer)).not_to include(/load it anyway/)
-          end
+        it 'does not include a "load it anyway" link' do
+          expect(helper.blob_render_error_options(viewer)).not_to include(/load it anyway/)
         end
 
         context 'when the viewer is rich' do
diff --git a/spec/helpers/diff_helper_spec.rb b/spec/helpers/diff_helper_spec.rb
index dd6566d25bb..a74615e07f9 100644
--- a/spec/helpers/diff_helper_spec.rb
+++ b/spec/helpers/diff_helper_spec.rb
@@ -33,17 +33,17 @@ describe DiffHelper do
 
   describe 'diff_options' do
     it 'returns no collapse false' do
-      expect(diff_options).to include(no_collapse: false)
+      expect(diff_options).to include(expanded: false)
     end
 
-    it 'returns no collapse true if expand_all_diffs' do
-      allow(controller).to receive(:params) { { expand_all_diffs: true } }
-      expect(diff_options).to include(no_collapse: true)
+    it 'returns no collapse true if expanded' do
+      allow(controller).to receive(:params) { { expanded: true } }
+      expect(diff_options).to include(expanded: true)
     end
 
     it 'returns no collapse true if action name diff_for_path' do
       allow(controller).to receive(:action_name) { 'diff_for_path' }
-      expect(diff_options).to include(no_collapse: true)
+      expect(diff_options).to include(expanded: true)
     end
 
     it 'returns paths if action name diff_for_path and param old path' do
@@ -129,6 +129,33 @@ describe DiffHelper do
     end
   end
 
+  describe '#parallel_diff_discussions' do
+    let(:discussion) { { 'abc_3_3' => 'comment' } }
+    let(:diff_file) { double(line_code: 'abc_3_3') }
+
+    before do
+      helper.instance_variable_set(:@grouped_diff_discussions, discussion)
+    end
+
+    it 'does not put comments on nonewline lines' do
+      left = Gitlab::Diff::Line.new('\\nonewline', 'old-nonewline', 3, 3, 3)
+      right = Gitlab::Diff::Line.new('\\nonewline', 'new-nonewline', 3, 3, 3)
+
+      result = helper.parallel_diff_discussions(left, right, diff_file)
+
+      expect(result).to eq([nil, nil])
+    end
+
+    it 'puts comments on added lines' do
+      left = Gitlab::Diff::Line.new('\\nonewline', 'old-nonewline', 3, 3, 3)
+      right = Gitlab::Diff::Line.new('new line', 'add', 3, 3, 3)
+
+      result = helper.parallel_diff_discussions(left, right, diff_file)
+
+      expect(result).to eq([nil, 'comment'])
+    end
+  end
+
   describe "#diff_match_line" do
     let(:old_pos) { 40 }
     let(:new_pos) { 50 }
diff --git a/spec/helpers/issuables_helper_spec.rb b/spec/helpers/issuables_helper_spec.rb
index 728fdfc85f2..8fcf7f5fa15 100644
--- a/spec/helpers/issuables_helper_spec.rb
+++ b/spec/helpers/issuables_helper_spec.rb
@@ -193,39 +193,14 @@ describe IssuablesHelper do
     end
   end
 
-  describe '#issuable_app_data' do
-    let(:user) { create(:user) }
-    let(:project) { create(:project) }
-    let(:issue) { create(:issue, project: project, last_edited_by: user, created_at: 3.days.ago, updated_at: 2.days.ago, last_edited_at: 2.days.ago) }
-    let(:issue_app_data) do
-      {
-        endpoint: realtime_changes_namespace_project_issue_path(project.namespace, project, issue),
-        'can-update' => "true",
-        'issuable-ref' => issue.to_reference || '',
-        updated_at: issue.updated_at.to_time.iso8601,
-        updated_by: {
-          name: user.name,
-          path: user_path(user)
-        }
-      }
-    end
-
-    before do
-      allow(helper).to receive(:current_user).and_return(nil)
-      allow(helper).to receive(:can?).with(nil, :update_issue, issue).and_return(true)
-    end
-
-    it { expect(helper.issuable_app_data(issue.project, issue)).to eq(issue_app_data) }
-  end
-
   describe '#updated_at_by' do
     let(:user) { create(:user) }
     let(:unedited_issuable) { create(:issue) }
     let(:edited_issuable) { create(:issue, last_edited_by: user, created_at: 3.days.ago, updated_at: 2.days.ago, last_edited_at: 2.days.ago) }
     let(:edited_updated_at_by) do
       {
-        updated_at: edited_issuable.updated_at.to_time.iso8601,
-        updated_by: {
+        updatedAt: edited_issuable.updated_at.to_time.iso8601,
+        updatedBy: {
           name: user.name,
           path: user_path(user)
         }