Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 40 deletions

diff --git a/spec/features/issues/user_views_issue_spec.rb b/spec/features/issues/user_views_issue_spec.rb
index 17ff3e0c702..00aa7685e9d 100644
--- a/spec/features/issues/user_views_issue_spec.rb
+++ b/spec/features/issues/user_views_issue_spec.rb
@@ -39,42 +39,4 @@ RSpec.describe "User views issue", feature_category: :team_planning do
       expect(page).not_to have_link('Close issue')
     end
   end
-
-  describe 'user status' do
-    subject { visit(project_issue_path(project, issue)) }
-
-    context 'when showing status of the author of the issue' do
-      it_behaves_like 'showing user status' do
-        let(:user_with_status) { user }
-      end
-    end
-
-    context 'when showing status of a user who commented on an issue', :js do
-      it_behaves_like 'showing user status' do
-        let(:user_with_status) { user }
-      end
-    end
-
-    context 'when status message has an emoji', :js do
-      let_it_be(:message) { 'My status with an emoji' }
-      let_it_be(:message_emoji) { 'basketball' }
-      let_it_be(:status) { create(:user_status, user: user, emoji: 'smirk', message: "#{message} :#{message_emoji}:") }
-
-      it 'correctly renders the emoji' do
-        wait_for_requests
-
-        tooltip_span = page.first(".user-status-emoji[title^='#{message}']")
-
-        tooltip_span.hover
-
-        wait_for_requests
-
-        tooltip = page.find('.tooltip .tooltip-inner')
-
-        page.within(tooltip) do
-          expect(page).to have_emoji(message_emoji)
-        end
-      end
-    end
-  end
 end
diff --git a/spec/features/projects/pages/user_adds_domain_spec.rb b/spec/features/projects/pages/user_adds_domain_spec.rb
index 0f14729f736..14b01cb63d2 100644
--- a/spec/features/projects/pages/user_adds_domain_spec.rb
+++ b/spec/features/projects/pages/user_adds_domain_spec.rb
@@ -174,11 +174,16 @@ RSpec.describe 'User adds pages domain', :js, feature_category: :pages do
         expect(domain.key).to be_nil
       end
 
-      it 'shows the DNS ALIAS record', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/419686' do
+      it 'shows the DNS ALIAS record' do
         visit project_pages_path(project)
 
         within('#content-body') { click_link 'Edit' }
-        expect(page).to have_field :domain_dns, with: "#{domain.domain} ALIAS namespace1.example.com."
+        expect(page).to have_field :domain_dns, with: format(
+          "%{domain} ALIAS %{namespace}.%{pages_host}.",
+          domain: domain.domain,
+          namespace: domain.project.root_namespace.path,
+          pages_host: Settings.pages.host
+        )
       end
     end
   end