Address @DouweM's feedback on !3749.

- Use `TokenAuthenticatable` to generate the personal access token
- Remove a check for `authenticity_token` in application controller;
  this should've been `authentication_token`, maybe, and doesn't make
  any sense now.
- Have the datepicker appear inline

3 files changed, 26 insertions, 13 deletions

diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 1ec51465cd3..e8bdbf1afb7 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -40,12 +40,6 @@ describe ApplicationController do
 
     let(:user) { create(:user) }
 
-    it "logs the user in when the 'authenticity_token' param is populated with the private token" do
-      get :index, authenticity_token: user.private_token
-      expect(response.status).to eq(200)
-      expect(response.body).to eq("authenticated")
-    end
-
     it "logs the user in when the 'private_token' param is populated with the private token" do
       get :index, private_token: user.private_token
       expect(response.status).to eq(200)
diff --git a/spec/features/profiles/personal_access_tokens_spec.rb b/spec/features/profiles/personal_access_tokens_spec.rb
index ce972776ffe..e9fbeefae75 100644
--- a/spec/features/profiles/personal_access_tokens_spec.rb
+++ b/spec/features/profiles/personal_access_tokens_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Profile > Personal Access Tokens', feature: true do
+describe 'Profile > Personal Access Tokens', feature: true, js: true do
   let(:user) { create(:user) }
 
   before do
@@ -13,18 +13,22 @@ describe 'Profile > Personal Access Tokens', feature: true do
       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.inner_html
+      active_personal_access_tokens = find(".table.active-personal-access-tokens").native['innerHTML']
       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)
 
       fill_in "Name", with: FFaker::Product.brand
-      fill_in "Expires at", with: 5.days.from_now
+
+      # Set date to 1st of next month
+      find("a[title='Next']").click
+      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.inner_html
+      active_personal_access_tokens = find(".table.active-personal-access-tokens").native['innerHTML']
       expect(active_personal_access_tokens).to match(PersonalAccessToken.last.name)
-      expect(active_personal_access_tokens).to match(5.days.from_now.to_date.to_s)
+      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)
     end
   end
@@ -35,7 +39,7 @@ describe 'Profile > Personal Access Tokens', feature: true do
       visit profile_personal_access_tokens_path
       click_on "Revoke"
 
-      inactive_personal_access_tokens = find(".table.inactive-personal-access-tokens").native.inner_html
+      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
@@ -44,7 +48,7 @@ describe 'Profile > Personal Access Tokens', feature: true 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.inner_html
+      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
diff --git a/spec/models/personal_access_token_spec.rb b/spec/models/personal_access_token_spec.rb
new file mode 100644
index 00000000000..3e80a48175a
--- /dev/null
+++ b/spec/models/personal_access_token_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe PersonalAccessToken, models: true do
+  describe ".generate" do
+    it "generates a random token" do
+      personal_access_token = PersonalAccessToken.generate({})
+      expect(personal_access_token.token).to be_present
+    end
+
+    it "doesn't save the record" do
+      personal_access_token = PersonalAccessToken.generate({})
+      expect(personal_access_token).to_not be_persisted
+    end
+  end
+end