Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 48 deletions

diff --git a/spec/features/profile_spec.rb b/spec/features/profile_spec.rb
index eeb9bf476c3..34eb07d78f1 100644
--- a/spec/features/profile_spec.rb
+++ b/spec/features/profile_spec.rb
@@ -62,66 +62,33 @@ RSpec.describe 'Profile account page', :js do
     end
   end
 
-  describe 'when I reset feed token' do
-    it 'resets feed token with `hide_access_tokens` feature flag enabled' do
-      visit profile_personal_access_tokens_path
+  it 'allows resetting of feed token' do
+    visit profile_personal_access_tokens_path
 
-      within('[data-testid="feed-token-container"]') do
-        previous_token = find_field('Feed token').value
+    within('[data-testid="feed-token-container"]') do
+      previous_token = find_field('Feed token').value
 
-        accept_confirm { click_link('reset this token') }
+      accept_confirm { click_link('reset this token') }
 
-        click_button('Click to reveal')
+      click_button('Click to reveal')
 
-        expect(find_field('Feed token').value).not_to eq(previous_token)
-      end
-    end
-
-    it 'resets feed token with `hide_access_tokens` feature flag disabled' do
-      stub_feature_flags(hide_access_tokens: false)
-      visit profile_personal_access_tokens_path
-
-      within('.feed-token-reset') do
-        previous_token = find("#feed_token").value
-
-        accept_confirm { find('[data-testid="reset_feed_token_link"]').click }
-
-        expect(find('#feed_token').value).not_to eq(previous_token)
-      end
+      expect(find_field('Feed token').value).not_to eq(previous_token)
     end
   end
 
-  describe 'when I reset incoming email token' do
-    before do
-      allow(Gitlab.config.incoming_email).to receive(:enabled).and_return(true)
-      stub_feature_flags(bootstrap_confirmation_modals: false)
-    end
-
-    it 'resets incoming email token with `hide_access_tokens` feature flag enabled' do
-      visit profile_personal_access_tokens_path
-
-      within('[data-testid="incoming-email-token-container"]') do
-        previous_token = find_field('Incoming email token').value
-
-        accept_confirm { click_link('reset this token') }
+  it 'allows resetting of incoming email token' do
+    allow(Gitlab.config.incoming_email).to receive(:enabled).and_return(true)
 
-        click_button('Click to reveal')
+    visit profile_personal_access_tokens_path
 
-        expect(find_field('Incoming email token').value).not_to eq(previous_token)
-      end
-    end
+    within('[data-testid="incoming-email-token-container"]') do
+      previous_token = find_field('Incoming email token').value
 
-    it 'resets incoming email token with `hide_access_tokens` feature flag disabled' do
-      stub_feature_flags(hide_access_tokens: false)
-      visit profile_personal_access_tokens_path
+      accept_confirm { click_link('reset this token') }
 
-      within('.incoming-email-token-reset') do
-        previous_token = find('#incoming_email_token').value
+      click_button('Click to reveal')
 
-        accept_confirm { find('[data-testid="reset_email_token_link"]').click }
-
-        expect(find('#incoming_email_token').value).not_to eq(previous_token)
-      end
+      expect(find_field('Incoming email token').value).not_to eq(previous_token)
     end
   end