From d94df6ef83088b15f98a141355aae5a40c0fcbe2 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Mon, 25 Sep 2017 13:43:15 +0530
Subject: Update tests to reflect `user_avatar_without_link` helper changes

---
 spec/helpers/avatars_helper_spec.rb | 102 ++++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 40 deletions(-)

(limited to 'spec')

diff --git a/spec/helpers/avatars_helper_spec.rb b/spec/helpers/avatars_helper_spec.rb
index 4632c679972..f44e7ef6843 100644
--- a/spec/helpers/avatars_helper_spec.rb
+++ b/spec/helpers/avatars_helper_spec.rb
@@ -26,12 +26,13 @@ describe AvatarsHelper do
     subject { helper.user_avatar_without_link(options) }
 
     it 'displays user avatar' do
-      is_expected.to eq image_tag(
-        LazyImageTagHelper.placeholder_image,
-        class: 'avatar s16 has-tooltip  lazy',
+      is_expected.to eq tag(
+        :img,
         alt: "#{user.name}'s avatar",
-        title: user.name,
-        data: { container: 'body', src: avatar_icon(user, 16) }
+        src: avatar_icon(user, 16),
+        data: { container: 'body' },
+        class: 'avatar s16 has-tooltip',
+        title: user.name
       )
     end
 
@@ -39,12 +40,13 @@ describe AvatarsHelper do
       let(:options) { { user: user, css_class: '.cat-pics' } }
 
       it 'uses provided css_class' do
-        is_expected.to eq image_tag(
-          LazyImageTagHelper.placeholder_image,
-          class: "avatar s16 #{options[:css_class]} has-tooltip  lazy",
+        is_expected.to eq tag(
+          :img,
           alt: "#{user.name}'s avatar",
-          title: user.name,
-          data: { container: 'body', src: avatar_icon(user, 16) }
+          src: avatar_icon(user, 16),
+          data: { container: 'body' },
+          class: "avatar s16 #{options[:css_class]} has-tooltip",
+          title: user.name
         )
       end
     end
@@ -53,12 +55,13 @@ describe AvatarsHelper do
       let(:options) { { user: user, size: 99 } }
 
       it 'uses provided size' do
-        is_expected.to eq image_tag(
-          LazyImageTagHelper.placeholder_image,
-          class: "avatar s#{options[:size]} has-tooltip  lazy",
+        is_expected.to eq tag(
+          :img,
           alt: "#{user.name}'s avatar",
-          title: user.name,
-          data: { container: 'body', src: avatar_icon(user, options[:size]) }
+          src: avatar_icon(user, options[:size]),
+          data: { container: 'body' },
+          class: "avatar s#{options[:size]} has-tooltip",
+          title: user.name
         )
       end
     end
@@ -67,12 +70,28 @@ describe AvatarsHelper do
       let(:options) { { user: user, url: '/over/the/rainbow.png' } }
 
       it 'uses provided url' do
-        is_expected.to eq image_tag(
-          LazyImageTagHelper.placeholder_image,
-          class: 'avatar s16 has-tooltip  lazy',
+        is_expected.to eq tag(
+          :img,
           alt: "#{user.name}'s avatar",
-          title: user.name,
-          data: { container: 'body', src: options[:url] }
+          src: options[:url],
+          data: { container: 'body' },
+          class: "avatar s16 has-tooltip",
+          title: user.name
+        )
+      end
+    end
+
+    context 'with lazy parameter' do
+      let(:options) { { user: user, lazy: true } }
+
+      it 'adds `lazy` class to class list, sets `data-src` with avatar URL and `src` with placeholder image' do
+        is_expected.to eq tag(
+          :img,
+          alt: "#{user.name}'s avatar",
+          src: LazyImageTagHelper.placeholder_image,
+          data: { container: 'body', src: avatar_icon(user, 16) },
+          class: "avatar s16 has-tooltip lazy",
+          title: user.name
         )
       end
     end
@@ -82,12 +101,13 @@ describe AvatarsHelper do
         let(:options) { { user: user, has_tooltip: true } }
 
         it 'adds has-tooltip' do
-          is_expected.to eq image_tag(
-            LazyImageTagHelper.placeholder_image,
-            class: 'avatar s16 has-tooltip  lazy',
+          is_expected.to eq tag(
+            :img,
             alt: "#{user.name}'s avatar",
-            title: user.name,
-            data: { container: 'body', src: avatar_icon(user, 16) }
+            src: avatar_icon(user, 16),
+            data: { container: 'body' },
+            class: "avatar s16 has-tooltip",
+            title: user.name
           )
         end
       end
@@ -96,12 +116,12 @@ describe AvatarsHelper do
         let(:options) { { user: user, has_tooltip: false } }
 
         it 'does not add has-tooltip or data container' do
-          is_expected.to eq image_tag(
-            LazyImageTagHelper.placeholder_image,
-            class: 'avatar s16  lazy',
+          is_expected.to eq tag(
+            :img,
             alt: "#{user.name}'s avatar",
-            title: user.name,
-            data: { src: avatar_icon(user, 16) }
+            src: avatar_icon(user, 16),
+            class: "avatar s16",
+            title: user.name
           )
         end
       end
@@ -114,23 +134,25 @@ describe AvatarsHelper do
         let(:options) { { user: user, user_name: 'Tinky Winky' } }
 
         it 'prefers user parameter' do
-          is_expected.to eq image_tag(
-            LazyImageTagHelper.placeholder_image,
-            class: 'avatar s16 has-tooltip  lazy',
+          is_expected.to eq tag(
+            :img,
             alt: "#{user.name}'s avatar",
-            title: user.name,
-            data: { container: 'body', src: avatar_icon(user, 16) }
+            src: avatar_icon(user, 16),
+            data: { container: 'body' },
+            class: "avatar s16 has-tooltip",
+            title: user.name
           )
         end
       end
 
       it 'uses user_name and user_email parameter if user is not present' do
-        is_expected.to eq image_tag(
-          LazyImageTagHelper.placeholder_image,
-          class: 'avatar s16 has-tooltip  lazy',
+        is_expected.to eq tag(
+          :img,
           alt: "#{options[:user_name]}'s avatar",
-          title: options[:user_name],
-          data: { container: 'body', src: avatar_icon(options[:user_email], 16) }
+          src: avatar_icon(options[:user_email], 16),
+          data: { container: 'body' },
+          class: "avatar s16 has-tooltip",
+          title: options[:user_name]
         )
       end
     end
-- 
cgit v1.2.1