about summary refs log tree commit diff
path: root/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-01-28 08:58:32 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-01-28 08:58:32 +0100
commitb2915613fb247597d3de2f80c2c007b3369ac5bb (patch)
tree745c245cb4c2d16dcada37d1fb1cf5b13f4e2493 /spec/controllers/api/v1/accounts/credentials_controller_spec.rb
parentad6ddb9bdd3ceae3f9d5dde7b351081f0dfa2a9a (diff)
parente38fc319dc6897ca867a509b0c7a5878d34d0f00 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Upstream-updated lib textually too close to glitch-soc-only dep.
  Updated like upstream.
Diffstat (limited to 'spec/controllers/api/v1/accounts/credentials_controller_spec.rb')
-rw-r--r--spec/controllers/api/v1/accounts/credentials_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb b/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
index 1b29772c3..aae35ce38 100644
--- a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Api::V1::Accounts::CredentialsController do
   render_views
 
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:user)  { Fabricate(:user) }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
 
   context 'with an oauth token' do