mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-23 15:48:43 -05:00
3e50313fdc
Since rspec-rails 3, the default installation creates two helper files: * `spec_helper.rb` * `rails_helper.rb` `spec_helper.rb` is intended as a way of running specs that do not require Rails, whereas `rails_helper.rb` loads Rails (as Discourse's current `spec_helper.rb` does). For more information: https://www.relishapp.com/rspec/rspec-rails/docs/upgrade#default-helper-files In this commit, I've simply replaced all instances of `spec_helper` with `rails_helper`, and renamed the original `spec_helper.rb`. This brings the Discourse project closer to the standard usage of RSpec in a Rails app. At present, every spec relies on loading Rails, but there are likely many that don't need to. In a future pull request, I hope to introduce a separate, minimal `spec_helper.rb` which can be used in tests which don't rely on Rails.
31 lines
1.1 KiB
Ruby
31 lines
1.1 KiB
Ruby
require 'rails_helper'
|
|
|
|
describe UserActivator do
|
|
|
|
describe 'email_activator' do
|
|
|
|
it 'does not create new email token unless required' do
|
|
SiteSetting.email_token_valid_hours = 24
|
|
user = Fabricate(:user)
|
|
activator = EmailActivator.new(user, nil, nil, nil)
|
|
|
|
Jobs.expects(:enqueue).with(:user_email, has_entries(type: :signup, email_token: user.email_tokens.first.token))
|
|
activator.activate
|
|
end
|
|
|
|
it 'creates and send new email token if the existing token expired' do
|
|
SiteSetting.email_token_valid_hours = 24
|
|
user = Fabricate(:user)
|
|
email_token = user.email_tokens.first
|
|
email_token.update_column(:created_at, 48.hours.ago)
|
|
activator = EmailActivator.new(user, nil, nil, nil)
|
|
|
|
Jobs.expects(:enqueue).with(:user_email, has_entries(type: :signup))
|
|
Jobs.expects(:enqueue).with(:user_email, has_entries(type: :signup, email_token: email_token.token)).never
|
|
activator.activate
|
|
|
|
user.reload
|
|
expect(user.email_tokens.last.created_at).to be_within_one_second_of(Time.zone.now)
|
|
end
|
|
end
|
|
end
|