Only show a personal access token right after its creation.

1 files changed, 20 insertions, 12 deletions

diff --git a/spec/features/profiles/personal_access_tokens_spec.rb b/spec/features/profiles/personal_access_tokens_spec.rb
index e9fbeefae75..095c7d60e29 100644
--- a/spec/features/profiles/personal_access_tokens_spec.rb
+++ b/spec/features/profiles/personal_access_tokens_spec.rb
@@ -3,21 +3,35 @@ require 'spec_helper'
 describe 'Profile > Personal Access Tokens', feature: true, js: true do
   let(:user) { create(:user) }
 
+  def active_personal_access_tokens
+    find(".table.active-personal-access-tokens").native['innerHTML']
+  end
+
+  def inactive_personal_access_tokens
+    find(".table.inactive-personal-access-tokens").native['innerHTML']
+  end
+
+  def created_personal_access_token
+    find(".created-personal-access-token pre").native['innerHTML']
+  end
+
   before do
     login_as(user)
   end
 
   describe "token creation" do
-    it "allows creation of a token with an optional expiry date" do
+    it "allows creation of a token" do
       visit profile_personal_access_tokens_path
       fill_in "Name", with: FFaker::Product.brand
-      expect {click_on "Add Personal Access Token"}.to change { PersonalAccessToken.count }.by(1)
 
-      active_personal_access_tokens = find(".table.active-personal-access-tokens").native['innerHTML']
+      expect {click_on "Add Personal Access Token"}.to change { PersonalAccessToken.count }.by(1)
+      expect(created_personal_access_token).to eq(PersonalAccessToken.last.token)
       expect(active_personal_access_tokens).to match(PersonalAccessToken.last.name)
       expect(active_personal_access_tokens).to match("Never")
-      expect(active_personal_access_tokens).to match(PersonalAccessToken.last.token)
+    end
 
+    it "allows creation of a token with an expiry date" do
+      visit profile_personal_access_tokens_path
       fill_in "Name", with: FFaker::Product.brand
 
       # Set date to 1st of next month
@@ -25,11 +39,9 @@ describe 'Profile > Personal Access Tokens', feature: true, js: true do
       click_on "1"
 
       expect {click_on "Add Personal Access Token"}.to change { PersonalAccessToken.count }.by(1)
-
-      active_personal_access_tokens = find(".table.active-personal-access-tokens").native['innerHTML']
+      expect(created_personal_access_token).to eq(PersonalAccessToken.last.token)
       expect(active_personal_access_tokens).to match(PersonalAccessToken.last.name)
-      expect(active_personal_access_tokens).to match(Date.today.next_month.at_beginning_of_month.to_s)
-      expect(active_personal_access_tokens).to match(PersonalAccessToken.last.token)
+      expect(active_personal_access_tokens).to match(Date.today.next_month.at_beginning_of_month.to_s(:medium))
     end
   end
 
@@ -39,18 +51,14 @@ describe 'Profile > Personal Access Tokens', feature: true, js: true do
       visit profile_personal_access_tokens_path
       click_on "Revoke"
 
-      inactive_personal_access_tokens = find(".table.inactive-personal-access-tokens").native['innerHTML']
       expect(inactive_personal_access_tokens).to match(personal_access_token.name)
-      expect(inactive_personal_access_tokens).to match(personal_access_token.token)
     end
 
     it "moves expired tokens to the 'inactive' section" do
       personal_access_token = create(:personal_access_token, expires_at: 5.days.ago, user: user)
       visit profile_personal_access_tokens_path
 
-      inactive_personal_access_tokens = find(".table.inactive-personal-access-tokens").native['innerHTML']
       expect(inactive_personal_access_tokens).to match(personal_access_token.name)
-      expect(inactive_personal_access_tokens).to match(personal_access_token.token)
     end
   end
 end