diff options
author | ThibG <thib@sitedethib.com> | 2018-10-09 12:11:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-09 12:11:14 +0200 |
commit | 4134a10549a833ad5ab18b3c579304919d594ce1 (patch) | |
tree | 696f4b453ad029ffda3d0925c484c11b27b95cc6 /spec/features/log_in_spec.rb | |
parent | d0b1369a853dc2e5b7934c148547f71f8d103859 (diff) | |
parent | b368d3c15ddfca983e89ff2858f7f03eb7147d83 (diff) |
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/features/log_in_spec.rb')
-rw-r--r-- | spec/features/log_in_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/log_in_spec.rb b/spec/features/log_in_spec.rb index ed626d880..53a1f9b12 100644 --- a/spec/features/log_in_spec.rb +++ b/spec/features/log_in_spec.rb @@ -3,7 +3,7 @@ require "rails_helper" feature "Log in" do given(:email) { "test@examle.com" } given(:password) { "password" } - given(:confirmed_at) { Time.now } + given(:confirmed_at) { Time.zone.now } background do Fabricate(:user, email: email, password: password, confirmed_at: confirmed_at) |