Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 32 insertions, 0 deletions

diff --git a/spec/helpers/profiles_helper_spec.rb b/spec/helpers/profiles_helper_spec.rb
index 61b7ff94edb..9687d038162 100644
--- a/spec/helpers/profiles_helper_spec.rb
+++ b/spec/helpers/profiles_helper_spec.rb
@@ -80,6 +80,38 @@ RSpec.describe ProfilesHelper do
     end
   end
 
+  describe "#user_status_set_to_busy?" do
+    using RSpec::Parameterized::TableSyntax
+
+    where(:availability, :result) do
+      "busy"    | true
+      "not_set" | false
+      ""        | false
+      nil       | false
+    end
+
+    with_them do
+      it { expect(helper.user_status_set_to_busy?(OpenStruct.new(availability: availability))).to eq(result) }
+    end
+  end
+
+  describe "#show_status_emoji?" do
+    using RSpec::Parameterized::TableSyntax
+
+    where(:message, :emoji, :result) do
+      "Some message" | UserStatus::DEFAULT_EMOJI | true
+      "Some message" | ""                        | true
+      ""             | "basketball"              | true
+      ""             | "basketball"              | true
+      ""             | UserStatus::DEFAULT_EMOJI | false
+      ""             | UserStatus::DEFAULT_EMOJI | false
+    end
+
+    with_them do
+      it { expect(helper.show_status_emoji?(OpenStruct.new(message: message, emoji: emoji))).to eq(result) }
+    end
+  end
+
   def stub_cas_omniauth_provider
     provider = OpenStruct.new(
       'name' => 'cas3',