diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-09-30 12:23:57 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-09-30 12:23:57 +0200 |
| commit | 16ff7c5627c12a0c9658e9d2fac7c48002e1b788 (patch) | |
| tree | 465a73fb9f42bc2b01127b2d477b0715fb6185b4 /spec/controllers/auth/sessions_controller_spec.rb | |
| parent | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (diff) | |
| parent | 3babf8464b0903b854ec16d355909444ef3ca0bc (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb
Diffstat (limited to 'spec/controllers/auth/sessions_controller_spec.rb')
| -rw-r--r-- | spec/controllers/auth/sessions_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb index 7ed5edde0..1950c173a 100644 --- a/spec/controllers/auth/sessions_controller_spec.rb +++ b/spec/controllers/auth/sessions_controller_spec.rb @@ -80,7 +80,7 @@ RSpec.describe Auth::SessionsController, type: :controller do let(:user) do account = Fabricate.build(:account, username: 'pam_user1') account.save!(validate: false) - user = Fabricate(:user, email: 'pam@example.com', password: nil, account: account) + user = Fabricate(:user, email: 'pam@example.com', password: nil, account: account, external: true) user end |