1 files changed, 9 insertions, 6 deletions
diff --git a/spec/features/groups_spec.rb b/spec/features/groups_spec.rb
index ceb4af03f89..31390b110e7 100644
--- a/spec/features/groups_spec.rb
+++ b/spec/features/groups_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe 'Group' do
     end
 
     describe 'as a non-admin' do
-      it 'creates a group and persists visibility radio selection', :js do
+      it 'creates a group and persists visibility radio selection', :js, :saas do
         stub_application_setting(default_group_visibility: :private)
 
         fill_in 'Group name', with: 'test-group'
@@ -127,7 +127,7 @@ RSpec.describe 'Group' do
 
     describe 'Mattermost team creation' do
       before do
-        stub_mattermost_setting(enabled: mattermost_enabled)
+        stub_mattermost_setting(enabled: mattermost_enabled, host: 'https://mattermost.test')
 
         visit new_group_path
         click_link 'Create group'
@@ -145,13 +145,14 @@ RSpec.describe 'Group' do
         end
 
         it 'updates the team URL on graph path update', :js do
-          out_span = find('span[data-bind-out="create_chat_team"]', visible: false)
+          label = find('#group_create_chat_team ~ label[for=group_create_chat_team]')
+          url = 'https://mattermost.test/test-group'
 
-          expect(out_span.text).to be_empty
+          expect(label.text).not_to match(url)
 
           fill_in('group_path', with: 'test-group')
 
-          expect(out_span.text).to eq('test-group')
+          expect(label.text).to match(url)
         end
       end
 
@@ -497,7 +498,9 @@ RSpec.describe 'Group' do
     let_it_be(:group) { create(:group) }
     let_it_be_with_refind(:user) { create(:user) }
 
-    before_all do
+    before do
+      stub_feature_flags(namespace_storage_limit_bypass_date_check: false)
+
       group.add_owner(user)
       sign_in(user)
     end