consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Time.now -> Time.current

Browse Source
This commit is contained in:
kikito
2016-11-23 19:19:19 +01:00
parent 4782332691
commit f0b8cfd4a2
52 changed files with 262 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
spec/factories.rb
View File

@@ -7,7 +7,7 @@ FactoryGirl.define do
password 'judgmentday'
terms_of_service '1'
confirmed_at { Time.now }
confirmed_at { Time.current }
trait :incomplete_verification do
after :create do |user|
@@ -16,7 +16,7 @@ FactoryGirl.define do
end
trait :level_two do
residence_verified_at Time.now
residence_verified_at Time.current
unconfirmed_phone "611111111"
confirmed_phone "611111111"
sms_confirmation_code "1234"
@@ -25,17 +25,17 @@ FactoryGirl.define do
end
trait :level_three do
verified_at Time.now
verified_at Time.current
document_type "1"
document_number
end
trait :hidden do
hidden_at Time.now
hidden_at Time.current
end
trait :with_confirmed_hide do
confirmed_hide_at Time.now
confirmed_hide_at Time.current
end
end
@@ -86,7 +86,7 @@ FactoryGirl.define do
factory :lock do
user
tries 0
locked_until Time.now
locked_until Time.current
end
factory :verified_user do
@@ -101,15 +101,15 @@ FactoryGirl.define do
association :author, factory: :user
trait :hidden do
hidden_at Time.now
hidden_at Time.current
end
trait :with_ignored_flag do
ignored_flag_at Time.now
ignored_flag_at Time.current
end
trait :with_confirmed_hide do
confirmed_hide_at Time.now
confirmed_hide_at Time.current
end
trait :flagged do
@@ -146,15 +146,15 @@ FactoryGirl.define do
association :author, factory: :user
trait :hidden do
hidden_at Time.now
hidden_at Time.current
end
trait :with_ignored_flag do
ignored_flag_at Time.now
ignored_flag_at Time.current
end
trait :with_confirmed_hide do
confirmed_hide_at Time.now
confirmed_hide_at Time.current
end
trait :flagged do
@@ -212,15 +212,15 @@ FactoryGirl.define do
sequence(:body) { |n| "Comment body #{n}" }
trait :hidden do
hidden_at Time.now
hidden_at Time.current
end
trait :with_ignored_flag do
ignored_flag_at Time.now
ignored_flag_at Time.current
end
trait :with_confirmed_hide do
confirmed_hide_at Time.now
confirmed_hide_at Time.current
end
trait :flagged do
@@ -269,11 +269,11 @@ FactoryGirl.define do
sequence(:name) { |n| "org#{n}" }
trait :verified do
verified_at Time.now
verified_at Time.current
end
trait :rejected do
rejected_at Time.now
rejected_at Time.current
end
end
@@ -296,13 +296,13 @@ FactoryGirl.define do
factory :ahoy_event, :class => Ahoy::Event do
id { SecureRandom.uuid }
time DateTime.now
time DateTime.current
sequence(:name) {|n| "Event #{n} type"}
end
factory :visit do
id { SecureRandom.uuid }
started_at DateTime.now
started_at DateTime.current
end
factory :campaign do
@@ -326,8 +326,8 @@ FactoryGirl.define do
style {["banner-style-one", "banner-style-two", "banner-style-three"].sample}
image {["banner.banner-img-one", "banner.banner-img-two", "banner.banner-img-three"].sample}
target_url {["/proposals", "/debates" ].sample}
post_started_at Time.now - 7.days
post_ended_at Time.now + 7.days
post_started_at Time.current - 7.days
post_ended_at Time.current + 7.days
end
factory :proposal_notification do

34
spec/features/admin/banners_spec.rb
View File

@@ -13,40 +13,40 @@ feature 'Admin banners magement' do
target_url: "http://www.url.com",
style: "banner-style.banner-one",
image: "banner-img.banner-one",
post_started_at: (Time.now + 4.days),
post_ended_at: (Time.now + 10.days))
post_started_at: (Time.current + 4.days),
post_ended_at: (Time.current + 10.days))
@banner2 = create(:banner, title: "Banner number two",
description: "This is the text of banner number two and is not longer active",
target_url: "http://www.url.com",
style: "banner-style.banner-two",
image: "banner-img.banner-two",
post_started_at: (Time.now - 10.days),
post_ended_at: (Time.now - 3.days))
post_started_at: (Time.current - 10.days),
post_ended_at: (Time.current - 3.days))
@banner3 = create(:banner, title: "Banner number three",
description: "This is the text of banner number three and has style banner-three",
target_url: "http://www.url.com",
style: "banner-style.banner-three",
image: "banner-img.banner-three",
post_started_at: (Time.now - 1.days),
post_ended_at: (Time.now + 10.days))
post_started_at: (Time.current - 1.days),
post_ended_at: (Time.current + 10.days))
@banner4 = create(:banner, title: "Banner number four",
description: "This is the text of banner number four and has style banner-one",
target_url: "http://www.url.com",
style: "banner-style.banner-one",
image: "banner-img.banner-one",
post_started_at: (DateTime.now - 10.days),
post_ended_at: (DateTime.now + 10.days))
post_started_at: (DateTime.current - 10.days),
post_ended_at: (DateTime.current + 10.days))
@banner5 = create(:banner, title: "Banner number five",
description: "This is the text of banner number five and has style banner-two",
target_url: "http://www.url.com",
style: "banner-style.banner-one",
image: "banner-img.banner-one",
post_started_at: (DateTime.now - 10.days),
post_ended_at: (DateTime.now + 10.days))
post_started_at: (DateTime.current - 10.days),
post_ended_at: (DateTime.current + 10.days))
end
scenario 'Index show active banners' do
@@ -87,8 +87,8 @@ feature 'Admin banners magement' do
fill_in 'banner_title', with: 'Such banner'
fill_in 'banner_description', with: 'many text wow link'
fill_in 'banner_target_url', with: 'https://www.url.com'
last_week = Time.now - 7.days
next_week = Time.now + 7.days
last_week = Time.current - 7.days
next_week = Time.current + 7.days
fill_in 'post_started_at', with: last_week.strftime("%d/%m/%Y")
fill_in 'post_ended_at', with: next_week.strftime("%d/%m/%Y")
@@ -108,8 +108,8 @@ feature 'Admin banners magement' do
target_url: 'http://www.url.com',
style: 'banner-style.banner-one',
image: 'banner-img.banner-one',
post_started_at: (Time.now + 4.days),
post_ended_at: (Time.now + 10.days))
post_started_at: (Time.current + 4.days),
post_ended_at: (Time.current + 10.days))
visit admin_root_path
@@ -145,8 +145,8 @@ feature 'Admin banners magement' do
target_url: 'http://www.url.com',
style: 'banner-style.banner-one',
image: 'banner-img.banner-one',
post_started_at: (Time.now + 4.days),
post_ended_at: (Time.now + 10.days))
post_started_at: (Time.current + 4.days),
post_ended_at: (Time.current + 10.days))
visit admin_root_path
@@ -162,4 +162,4 @@ feature 'Admin banners magement' do
expect(page).to_not have_content 'Ugly banner'
end
end
end

4
spec/features/admin/verifications_spec.rb
View File

@@ -51,7 +51,7 @@ feature 'Incomplete verifications' do
end
scenario "Phone not given" do
incompletely_verified_user = create(:user, residence_verified_at: Time.now, unconfirmed_phone: nil)
incompletely_verified_user = create(:user, residence_verified_at: Time.current, unconfirmed_phone: nil)
visit admin_verifications_path
@@ -61,7 +61,7 @@ feature 'Incomplete verifications' do
end
scenario "SMS code not confirmed" do
incompletely_verified_user = create(:user, residence_verified_at: Time.now,
incompletely_verified_user = create(:user, residence_verified_at: Time.current,
unconfirmed_phone: "611111111",
sms_confirmation_code: "1234",
confirmed_phone: nil)

16
spec/features/comments/debates_spec.rb
View File

@@ -62,9 +62,9 @@ feature 'Commenting debates' do
end
scenario 'Comment order' do
c1 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.now - 2)
c2 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.now - 1)
c3 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 1, cached_votes_total: 2, created_at: Time.now)
c1 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.current - 2)
c2 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.current - 1)
c3 = create(:comment, :with_confidence_score, commentable: debate, cached_votes_up: 1, cached_votes_total: 2, created_at: Time.current)
visit debate_path(debate, order: :most_voted)
@@ -83,10 +83,10 @@ feature 'Commenting debates' do
end
scenario 'Creation date works differently in roots and in child comments, even when sorting by confidence_score' do
old_root = create(:comment, commentable: debate, created_at: Time.now - 10)
new_root = create(:comment, commentable: debate, created_at: Time.now)
old_child = create(:comment, commentable: debate, parent_id: new_root.id, created_at: Time.now - 10)
new_child = create(:comment, commentable: debate, parent_id: new_root.id, created_at: Time.now)
old_root = create(:comment, commentable: debate, created_at: Time.current - 10)
new_root = create(:comment, commentable: debate, created_at: Time.current)
old_child = create(:comment, commentable: debate, parent_id: new_root.id, created_at: Time.current - 10)
new_child = create(:comment, commentable: debate, parent_id: new_root.id, created_at: Time.current)
visit debate_path(debate, order: :most_voted)
@@ -418,7 +418,7 @@ feature 'Commenting debates' do
feature 'Voting comments' do
background do
@manuela = create(:user, verified_at: Time.now)
@manuela = create(:user, verified_at: Time.current)
@pablo = create(:user)
@debate = create(:debate)
@comment = create(:comment, commentable: @debate)

16
spec/features/comments/proposals_spec.rb
View File

@@ -62,9 +62,9 @@ feature 'Commenting proposals' do
end
scenario 'Comment order' do
c1 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.now - 2)
c2 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.now - 1)
c3 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 1, cached_votes_total: 2, created_at: Time.now)
c1 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 100, cached_votes_total: 120, created_at: Time.current - 2)
c2 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 10, cached_votes_total: 12, created_at: Time.current - 1)
c3 = create(:comment, :with_confidence_score, commentable: proposal, cached_votes_up: 1, cached_votes_total: 2, created_at: Time.current)
visit proposal_path(proposal, order: :most_voted)
@@ -83,10 +83,10 @@ feature 'Commenting proposals' do
end
scenario 'Creation date works differently in roots and in child comments, when sorting by confidence_score' do
old_root = create(:comment, commentable: proposal, created_at: Time.now - 10)
new_root = create(:comment, commentable: proposal, created_at: Time.now)
old_child = create(:comment, commentable: proposal, parent_id: new_root.id, created_at: Time.now - 10)
new_child = create(:comment, commentable: proposal, parent_id: new_root.id, created_at: Time.now)
old_root = create(:comment, commentable: proposal, created_at: Time.current - 10)
new_root = create(:comment, commentable: proposal, created_at: Time.current)
old_child = create(:comment, commentable: proposal, parent_id: new_root.id, created_at: Time.current - 10)
new_child = create(:comment, commentable: proposal, parent_id: new_root.id, created_at: Time.current)
visit proposal_path(proposal, order: :most_voted)
@@ -407,7 +407,7 @@ feature 'Commenting proposals' do
feature 'Voting comments' do
background do
@manuela = create(:user, verified_at: Time.now)
@manuela = create(:user, verified_at: Time.current)
@pablo = create(:user)
@proposal = create(:proposal)
@comment = create(:comment, commentable: @proposal)

10
spec/features/debates_spec.rb
View File

@@ -422,9 +422,9 @@ feature 'Debates' do
end
scenario 'Debates are ordered by newest', :js do
create(:debate, title: 'Best', created_at: Time.now)
create(:debate, title: 'Medium', created_at: Time.now - 1.hour)
create(:debate, title: 'Worst', created_at: Time.now - 1.day)
create(:debate, title: 'Best', created_at: Time.current)
create(:debate, title: 'Medium', created_at: Time.current - 1.hour)
create(:debate, title: 'Worst', created_at: Time.current - 1.day)
visit debates_path
click_link 'newest'
@@ -808,7 +808,7 @@ feature 'Debates' do
scenario "Reorder results maintaing search", :js do
debate1 = create(:debate, title: "Show you got", cached_votes_up: 10, created_at: 1.week.ago)
debate2 = create(:debate, title: "Show what you got", cached_votes_up: 1, created_at: 1.month.ago)
debate3 = create(:debate, title: "Show you got", cached_votes_up: 100, created_at: Time.now)
debate3 = create(:debate, title: "Show you got", cached_votes_up: 100, created_at: Time.current)
debate4 = create(:debate, title: "Do not display", cached_votes_up: 1, created_at: 1.week.ago)
visit debates_path
@@ -1032,7 +1032,7 @@ feature 'Debates' do
admin = create(:administrator)
login_as(admin.user)
debate1 = create(:debate, featured_at: Time.now)
debate1 = create(:debate, featured_at: Time.current)
debate2 = create(:debate)
visit debates_path

6
spec/features/moderation/comments_spec.rb
View File

@@ -170,9 +170,9 @@ feature 'Moderate comments' do
end
scenario "sorting comments" do
create(:comment, body: "Flagged comment", created_at: Time.now - 1.day, flags_count: 5)
create(:comment, body: "Flagged newer comment", created_at: Time.now - 12.hours, flags_count: 3)
create(:comment, body: "Newer comment", created_at: Time.now)
create(:comment, body: "Flagged comment", created_at: Time.current - 1.day, flags_count: 5)
create(:comment, body: "Flagged newer comment", created_at: Time.current - 12.hours, flags_count: 3)
create(:comment, body: "Newer comment", created_at: Time.current)
visit moderation_comments_path(order: 'newest')

6
spec/features/moderation/debates_spec.rb
View File

@@ -177,9 +177,9 @@ feature 'Moderate debates' do
end
scenario "sorting debates" do
create(:debate, title: "Flagged debate", created_at: Time.now - 1.day, flags_count: 5)
create(:debate, title: "Flagged newer debate", created_at: Time.now - 12.hours, flags_count: 3)
create(:debate, title: "Newer debate", created_at: Time.now)
create(:debate, title: "Flagged debate", created_at: Time.current - 1.day, flags_count: 5)
create(:debate, title: "Flagged newer debate", created_at: Time.current - 12.hours, flags_count: 3)
create(:debate, title: "Newer debate", created_at: Time.current)
visit moderation_debates_path(order: 'created_at')

6
spec/features/moderation/proposals_spec.rb
View File

@@ -169,9 +169,9 @@ feature 'Moderate proposals' do
end
scenario "sorting proposals" do
create(:proposal, title: "Flagged proposal", created_at: Time.now - 1.day, flags_count: 5)
create(:proposal, title: "Flagged newer proposal", created_at: Time.now - 12.hours, flags_count: 3)
create(:proposal, title: "Newer proposal", created_at: Time.now)
create(:proposal, title: "Flagged proposal", created_at: Time.current - 1.day, flags_count: 5)
create(:proposal, title: "Flagged newer proposal", created_at: Time.current - 12.hours, flags_count: 3)
create(:proposal, title: "Newer proposal", created_at: Time.current)
visit moderation_proposals_path(order: 'created_at')

16
spec/features/proposals_spec.rb
View File

@@ -480,7 +480,7 @@ feature 'Proposals' do
scenario 'Index do not list retired proposals by default' do
create_featured_proposals
not_retired = create(:proposal)
retired = create(:proposal, retired_at: Time.now)
retired = create(:proposal, retired_at: Time.current)
visit proposals_path
@@ -494,7 +494,7 @@ feature 'Proposals' do
scenario 'Index has a link to retired proposals list' do
create_featured_proposals
not_retired = create(:proposal)
retired = create(:proposal, retired_at: Time.now)
retired = create(:proposal, retired_at: Time.current)
visit proposals_path
@@ -514,8 +514,8 @@ feature 'Proposals' do
end
scenario 'Retired proposals index has links to filter by retired_reason' do
unfeasible = create(:proposal, retired_at: Time.now, retired_reason: 'unfeasible')
duplicated = create(:proposal, retired_at: Time.now, retired_reason: 'duplicated')
unfeasible = create(:proposal, retired_at: Time.current, retired_reason: 'unfeasible')
duplicated = create(:proposal, retired_at: Time.current, retired_reason: 'duplicated')
visit proposals_path(retired: 'all')
@@ -660,9 +660,9 @@ feature 'Proposals' do
scenario 'Proposals are ordered by newest', :js do
create_featured_proposals
create(:proposal, title: 'Best proposal', created_at: Time.now)
create(:proposal, title: 'Medium proposal', created_at: Time.now - 1.hour)
create(:proposal, title: 'Worst proposal', created_at: Time.now - 1.day)
create(:proposal, title: 'Best proposal', created_at: Time.current)
create(:proposal, title: 'Medium proposal', created_at: Time.current - 1.hour)
create(:proposal, title: 'Worst proposal', created_at: Time.current - 1.day)
visit proposals_path
click_link 'newest'
@@ -1172,7 +1172,7 @@ feature 'Proposals' do
scenario "Reorder results maintaing search", :js do
proposal1 = create(:proposal, title: "Show you got", cached_votes_up: 10, created_at: 1.week.ago)
proposal2 = create(:proposal, title: "Show what you got", cached_votes_up: 1, created_at: 1.month.ago)
proposal3 = create(:proposal, title: "Show you got", cached_votes_up: 100, created_at: Time.now)
proposal3 = create(:proposal, title: "Show you got", cached_votes_up: 100, created_at: Time.current)
proposal4 = create(:proposal, title: "Do not display", cached_votes_up: 1, created_at: 1.week.ago)
visit proposals_path

10
spec/features/users_auth_spec.rb
View File

@@ -286,7 +286,7 @@ feature 'Users' do
end
scenario 'Sign in, admin with password expired' do
user = create(:user, password_changed_at: Time.now - 1.year)
user = create(:user, password_changed_at: Time.current - 1.year)
admin = create(:administrator, user: user)
login_as(admin.user)
@@ -304,7 +304,7 @@ feature 'Users' do
end
scenario 'Sign in, admin without password expired' do
user = create(:user, password_changed_at: Time.now - 360.days)
user = create(:user, password_changed_at: Time.current - 360.days)
admin = create(:administrator, user: user)
login_as(admin.user)
@@ -314,7 +314,7 @@ feature 'Users' do
end
scenario 'Sign in, user with password expired' do
user = create(:user, password_changed_at: Time.now - 1.year)
user = create(:user, password_changed_at: Time.current - 1.year)
login_as(user)
visit root_path
@@ -323,7 +323,7 @@ feature 'Users' do
end
scenario 'Admin with password expired trying to use same password' do
user = create(:user, password_changed_at: Time.now - 1.year, password: '123456789')
user = create(:user, password_changed_at: Time.current - 1.year, password: '123456789')
admin = create(:administrator, user: user)
login_as(admin.user)
@@ -339,4 +339,4 @@ feature 'Users' do
expect(page).to have_content "must be different than the current password."
end
end
end

8
spec/features/verification/email_spec.rb
View File

@@ -4,7 +4,7 @@ feature 'Verify email' do
scenario 'Verify' do
user = create(:user,
residence_verified_at: Time.now,
residence_verified_at: Time.current,
document_number: '12345678Z',
document_type: 'dni')
@@ -34,7 +34,7 @@ feature 'Verify email' do
end
scenario "Errors on token verification" do
user = create(:user, residence_verified_at: Time.now)
user = create(:user, residence_verified_at: Time.current)
login_as(user)
visit email_path(email_verification_token: "1234")
@@ -44,7 +44,7 @@ feature 'Verify email' do
scenario "Errors on sending confirmation email" do
user = create(:user,
residence_verified_at: Time.now,
residence_verified_at: Time.current,
document_number: '12345678Z',
document_type: 'dni')
@@ -62,4 +62,4 @@ feature 'Verify email' do
expect(page).to have_content "There was a problem with sending an email to your account"
end
end
end

16
spec/features/verification/letter_spec.rb
View File

@@ -3,7 +3,7 @@ require 'rails_helper'
feature 'Verify Letter' do
scenario 'Request a letter' do
user = create(:user, residence_verified_at: Time.now,
user = create(:user, residence_verified_at: Time.current,
confirmed_phone: "611111111")
login_as(user)
@@ -20,7 +20,7 @@ feature 'Verify Letter' do
end
scenario 'Go to office instead of send letter' do
user = create(:user, residence_verified_at: Time.now,
user = create(:user, residence_verified_at: Time.current,
confirmed_phone: "611111111")
login_as(user)
@@ -40,7 +40,7 @@ feature 'Verify Letter' do
end
scenario "Deny access unless verified phone/email" do
user = create(:user, residence_verified_at: Time.now)
user = create(:user, residence_verified_at: Time.current)
login_as(user)
visit new_letter_path
@@ -52,7 +52,7 @@ feature 'Verify Letter' do
context "Code verification" do
scenario "Valid verification user logged in" do
user = create(:user, residence_verified_at: Time.now,
user = create(:user, residence_verified_at: Time.current,
confirmed_phone: "611111111",
letter_verification_code: "123456")
@@ -69,7 +69,7 @@ feature 'Verify Letter' do
end
scenario "Valid verification of user failing to add trailing zeros" do
user = create(:user, residence_verified_at: Time.now,
user = create(:user, residence_verified_at: Time.current,
confirmed_phone: "611111111",
letter_verification_code: "012345")
@@ -86,7 +86,7 @@ feature 'Verify Letter' do
end
scenario "Valid verification user not logged in" do
user = create(:user, residence_verified_at: Time.now,
user = create(:user, residence_verified_at: Time.current,
confirmed_phone: "611111111",
letter_verification_code: "123456")
@@ -110,7 +110,7 @@ feature 'Verify Letter' do
end
scenario "Error messages on verification" do
user = create(:user, residence_verified_at: Time.now,
user = create(:user, residence_verified_at: Time.current,
confirmed_phone: "611111111")
visit edit_letter_path
@@ -122,7 +122,7 @@ feature 'Verify Letter' do
end
scenario '6 tries allowed' do
user = create(:user, residence_verified_at: Time.now,
user = create(:user, residence_verified_at: Time.current,
confirmed_phone: "611111111",
letter_verification_code: "123456")

10
spec/features/verification/sms_spec.rb
View File

@@ -3,7 +3,7 @@ require 'rails_helper'
feature 'SMS Verification' do
scenario 'Verify' do
user = create(:user, residence_verified_at: Time.now)
user = create(:user, residence_verified_at: Time.current)
login_as(user)
visit new_sms_path
@@ -21,7 +21,7 @@ feature 'SMS Verification' do
end
scenario 'Errors on phone number' do
user = create(:user, residence_verified_at: Time.now)
user = create(:user, residence_verified_at: Time.current)
login_as(user)
visit new_sms_path
@@ -32,7 +32,7 @@ feature 'SMS Verification' do
end
scenario 'Errors on verification code' do
user = create(:user, residence_verified_at: Time.now)
user = create(:user, residence_verified_at: Time.current)
login_as(user)
visit new_sms_path
@@ -58,7 +58,7 @@ feature 'SMS Verification' do
end
scenario '5 tries allowed' do
user = create(:user, residence_verified_at: Time.now)
user = create(:user, residence_verified_at: Time.current)
login_as(user)
visit new_sms_path
@@ -77,4 +77,4 @@ feature 'SMS Verification' do
expect(current_path).to eq(account_path)
end
end
end

20
spec/features/verification/verification_path_spec.rb
View File

@@ -3,7 +3,7 @@ require 'rails_helper'
feature 'Verification path' do
scenario "User is an organization" do
user = create(:user, verified_at: Time.now)
user = create(:user, verified_at: Time.current)
create(:organization, user: user)
login_as(user)
@@ -13,7 +13,7 @@ feature 'Verification path' do
end
scenario "User is verified" do
user = create(:user, verified_at: Time.now)
user = create(:user, verified_at: Time.current)
login_as(user)
visit verification_path
@@ -23,8 +23,8 @@ feature 'Verification path' do
end
scenario "User requested a letter" do
user = create(:user, confirmed_phone: "623456789", residence_verified_at: Time.now,
letter_requested_at: Time.now, letter_verification_code: "666")
user = create(:user, confirmed_phone: "623456789", residence_verified_at: Time.current,
letter_requested_at: Time.current, letter_verification_code: "666")
login_as(user)
visit verification_path
@@ -33,7 +33,7 @@ feature 'Verification path' do
end
scenario "User is level two verified" do
user = create(:user, residence_verified_at: Time.now, confirmed_phone: "666666666")
user = create(:user, residence_verified_at: Time.current, confirmed_phone: "666666666")
login_as(user)
visit verification_path
@@ -42,7 +42,7 @@ feature 'Verification path' do
end
scenario "User received a verification sms" do
user = create(:user, residence_verified_at: Time.now, unconfirmed_phone: "666666666", sms_confirmation_code: "666")
user = create(:user, residence_verified_at: Time.current, unconfirmed_phone: "666666666", sms_confirmation_code: "666")
login_as(user)
visit verification_path
@@ -51,7 +51,7 @@ feature 'Verification path' do
end
scenario "User received verification email" do
user = create(:user, residence_verified_at: Time.now, email_verification_token: "1234")
user = create(:user, residence_verified_at: Time.current, email_verification_token: "1234")
login_as(user)
visit verification_path
@@ -64,7 +64,7 @@ feature 'Verification path' do
end
scenario "User has verified residence" do
user = create(:user, residence_verified_at: Time.now)
user = create(:user, residence_verified_at: Time.current)
login_as(user)
visit verification_path
@@ -86,7 +86,7 @@ feature 'Verification path' do
end
scenario "A verified user can not access verification pages" do
user = create(:user, verified_at: Time.now)
user = create(:user, verified_at: Time.current)
login_as(user)
@@ -99,4 +99,4 @@ feature 'Verification path' do
end
end
end
end

16
spec/features/verification/verified_user_spec.rb
View File

@@ -4,7 +4,7 @@ feature 'Verified users' do
scenario "Verified emails" do
user = create(:user,
residence_verified_at: Time.now,
residence_verified_at: Time.current,
document_number: '12345678Z')
create(:verified_user,
@@ -29,7 +29,7 @@ feature 'Verified users' do
scenario "Verified phones" do
user = create(:user,
residence_verified_at: Time.now,
residence_verified_at: Time.current,
document_number: '12345678Z')
create(:verified_user,
@@ -54,7 +54,7 @@ feature 'Verified users' do
scenario "No emails or phones" do
user = create(:user,
residence_verified_at: Time.now,
residence_verified_at: Time.current,
document_number: '12345678Z')
create(:verified_user,
@@ -72,7 +72,7 @@ feature 'Verified users' do
scenario "Select a verified email" do
user = create(:user,
residence_verified_at: Time.now,
residence_verified_at: Time.current,
document_number: '12345678Z')
verified_user = create(:verified_user,
@@ -92,7 +92,7 @@ feature 'Verified users' do
scenario "Select a verified phone" do
user = create(:user,
residence_verified_at: Time.now,
residence_verified_at: Time.current,
document_number: '12345678Z')
verified_user = create(:verified_user,
@@ -111,7 +111,7 @@ feature 'Verified users' do
scenario "Continue without selecting any verified information" do
user = create(:user,
residence_verified_at: Time.now,
residence_verified_at: Time.current,
document_number: '12345678Z')
create(:verified_user,
@@ -127,7 +127,7 @@ feature 'Verified users' do
end
scenario "No verified information" do
user = create(:user, residence_verified_at: Time.now)
user = create(:user, residence_verified_at: Time.current)
login_as(user)
visit verified_user_path
@@ -135,4 +135,4 @@ feature 'Verified users' do
expect(current_path).to eq(new_sms_path)
end
end
end

2
spec/features/votes_spec.rb
View File

@@ -3,7 +3,7 @@ require 'rails_helper'
feature 'Votes' do
background do
@manuela = create(:user, verified_at: Time.now)
@manuela = create(:user, verified_at: Time.current)
@pablo = create(:user)
end

4
spec/features/welcome_spec.rb
View File

@@ -45,7 +45,7 @@ feature "Welcome screen" do
end
scenario 'it is not shown to level-2 users' do
user = create(:user, residence_verified_at: Time.now, confirmed_phone: "123")
user = create(:user, residence_verified_at: Time.current, confirmed_phone: "123")
login_through_form_as(user)
@@ -53,7 +53,7 @@ feature "Welcome screen" do
end
scenario 'it is not shown to level-3 users' do
user = create(:user, verified_at: Time.now)
user = create(:user, verified_at: Time.current)
login_through_form_as(user)

6
spec/lib/email_digests_spec.rb
View File

@@ -51,7 +51,7 @@ describe EmailDigest do
user = create(:user)
proposal_notification = create(:proposal_notification)
notification = create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.now)
notification = create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.current)
email_digest = EmailDigest.new(user)
expect(email_digest.pending_notifications?).to_not be
@@ -85,7 +85,7 @@ describe EmailDigest do
user = create(:user)
proposal_notification = create(:proposal_notification)
create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.now)
create(:notification, notifiable: proposal_notification, user: user, emailed_at: Time.current)
reset_mailer
email_digest = EmailDigest.new(user)
@@ -124,4 +124,4 @@ describe EmailDigest do
end
end
end

4
spec/models/abilities/common_spec.rb
View File

@@ -90,7 +90,7 @@ describe "Abilities::Common" do
describe "when level 2 verified" do
let(:own_spending_proposal) { create(:spending_proposal, author: user) }
let(:own_direct_message) { create(:direct_message, sender: user) }
before{ user.update(residence_verified_at: Time.now, confirmed_phone: "1") }
before{ user.update(residence_verified_at: Time.current, confirmed_phone: "1") }
it { should be_able_to(:vote, Proposal) }
it { should be_able_to(:vote_featured, Proposal) }
@@ -108,7 +108,7 @@ describe "Abilities::Common" do
describe "when level 3 verified" do
let(:own_spending_proposal) { create(:spending_proposal, author: user) }
let(:own_direct_message) { create(:direct_message, sender: user) }
before{ user.update(verified_at: Time.now) }
before{ user.update(verified_at: Time.current) }
it { should be_able_to(:vote, Proposal) }
it { should be_able_to(:vote_featured, Proposal) }

16
spec/models/debate_spec.rb
View File

@@ -129,12 +129,12 @@ describe Debate do
end
it "should be true for level two verified users" do
user = create(:user, residence_verified_at: Time.now, confirmed_phone: "666333111")
user = create(:user, residence_verified_at: Time.current, confirmed_phone: "666333111")
expect(debate.votable_by?(user)).to be true
end
it "should be true for level three verified users" do
user = create(:user, verified_at: Time.now)
user = create(:user, verified_at: Time.current)
expect(debate.votable_by?(user)).to be true
end
@@ -166,24 +166,24 @@ describe Debate do
describe "from level two verified users" do
it "should register vote" do
user = create(:user, residence_verified_at: Time.now, confirmed_phone: "666333111")
user = create(:user, residence_verified_at: Time.current, confirmed_phone: "666333111")
expect {debate.register_vote(user, 'yes')}.to change{debate.reload.votes_for.size}.by(1)
end
it "should not increase anonymous votes counter " do
user = create(:user, residence_verified_at: Time.now, confirmed_phone: "666333111")
user = create(:user, residence_verified_at: Time.current, confirmed_phone: "666333111")
expect {debate.register_vote(user, 'yes')}.to_not change{debate.reload.cached_anonymous_votes_total}
end
end
describe "from level three verified users" do
it "should register vote" do
user = create(:user, verified_at: Time.now)
user = create(:user, verified_at: Time.current)
expect {debate.register_vote(user, 'yes')}.to change{debate.reload.votes_for.size}.by(1)
end
it "should not increase anonymous votes counter " do
user = create(:user, verified_at: Time.now)
user = create(:user, verified_at: Time.current)
expect {debate.register_vote(user, 'yes')}.to_not change{debate.reload.cached_anonymous_votes_total}
end
end
@@ -225,7 +225,7 @@ describe Debate do
end
describe '#hot_score' do
let(:now) { Time.now }
let(:now) { Time.current }
it "increases for newer debates" do
old = create(:debate, :with_hot_score, created_at: now - 1.day)
@@ -611,7 +611,7 @@ describe Debate do
it "should be able to reorder by created_at after searching" do
recent = create(:debate, title: 'stop corruption', cached_votes_up: 1, created_at: 1.week.ago)
newest = create(:debate, title: 'stop corruption', cached_votes_up: 2, created_at: Time.now)
newest = create(:debate, title: 'stop corruption', cached_votes_up: 2, created_at: Time.current)
oldest = create(:debate, title: 'stop corruption', cached_votes_up: 3, created_at: 1.month.ago)
results = Debate.search('stop corruption')

20
spec/models/organization_spec.rb
View File

@@ -9,17 +9,17 @@ describe Organization do
expect(subject.verified?).to be false
end
it "is true when verified_at? exists" do
subject.verified_at = Time.now
subject.verified_at = Time.current
expect(subject.verified?).to be true
end
it "is false when the organization was verified and then rejected" do
subject.verified_at = Time.now
subject.rejected_at = Time.now + 1
subject.verified_at = Time.current
subject.rejected_at = Time.current + 1
expect(subject.verified?).to be false
end
it "is true when the organization was rejected and then verified" do
subject.rejected_at = Time.now
subject.verified_at = Time.now + 1
subject.rejected_at = Time.current
subject.verified_at = Time.current + 1
expect(subject.verified?).to be true
end
end
@@ -29,17 +29,17 @@ describe Organization do
expect(subject.rejected?).to be false
end
it "is true when rejected_at? exists" do
subject.rejected_at = Time.now
subject.rejected_at = Time.current
expect(subject.rejected?).to be true
end
it "is true when the organization was verified and then rejected" do
subject.verified_at = Time.now
subject.rejected_at = Time.now + 1
subject.verified_at = Time.current
subject.rejected_at = Time.current + 1
expect(subject.rejected?).to be true
end
it "is false when the organization was rejected and then verified" do
subject.rejected_at = Time.now
subject.verified_at = Time.now + 1
subject.rejected_at = Time.current
subject.verified_at = Time.current + 1
expect(subject.rejected?).to be false
end
end

20
spec/models/proposal_spec.rb
View File

@@ -166,12 +166,12 @@ describe Proposal do
let(:proposal) { create(:proposal) }
it "should be true for level two verified users" do
user = create(:user, residence_verified_at: Time.now, confirmed_phone: "666333111")
user = create(:user, residence_verified_at: Time.current, confirmed_phone: "666333111")
expect(proposal.votable_by?(user)).to be true
end
it "should be true for level three verified users" do
user = create(:user, verified_at: Time.now)
user = create(:user, verified_at: Time.current)
expect(proposal.votable_by?(user)).to be true
end
@@ -186,14 +186,14 @@ describe Proposal do
describe "from level two verified users" do
it "should register vote" do
user = create(:user, residence_verified_at: Time.now, confirmed_phone: "666333111")
user = create(:user, residence_verified_at: Time.current, confirmed_phone: "666333111")
expect {proposal.register_vote(user, 'yes')}.to change{proposal.reload.votes_for.size}.by(1)
end
end
describe "from level three verified users" do
it "should register vote" do
user = create(:user, verified_at: Time.now)
user = create(:user, verified_at: Time.current)
expect {proposal.register_vote(user, 'yes')}.to change{proposal.reload.votes_for.size}.by(1)
end
end
@@ -206,7 +206,7 @@ describe Proposal do
end
it "should not register vote for archived proposals" do
user = create(:user, verified_at: Time.now)
user = create(:user, verified_at: Time.current)
archived_proposal = create(:proposal, :archived)
expect {archived_proposal.register_vote(user, 'yes')}.to change{proposal.reload.votes_for.size}.by(0)
@@ -230,7 +230,7 @@ describe Proposal do
end
describe '#hot_score' do
let(:now) { Time.now }
let(:now) { Time.current }
it "increases for newer proposals" do
old = create(:proposal, :with_hot_score, created_at: now - 1.day)
@@ -267,7 +267,7 @@ describe Proposal do
it "increases with votes" do
previous = proposal.hot_score
5.times { proposal.register_vote(create(:user, verified_at: Time.now), true) }
5.times { proposal.register_vote(create(:user, verified_at: Time.current), true) }
expect(previous).to be < proposal.reload.hot_score
end
@@ -317,7 +317,7 @@ describe Proposal do
it "increases with like" do
previous = proposal.confidence_score
5.times { proposal.register_vote(create(:user, verified_at: Time.now), true) }
5.times { proposal.register_vote(create(:user, verified_at: Time.current), true) }
expect(previous).to be < proposal.confidence_score
end
end
@@ -612,7 +612,7 @@ describe Proposal do
it "should be able to reorder by created_at after searching" do
recent = create(:proposal, title: 'stop corruption', cached_votes_up: 1, created_at: 1.week.ago)
newest = create(:proposal, title: 'stop corruption', cached_votes_up: 2, created_at: Time.now)
newest = create(:proposal, title: 'stop corruption', cached_votes_up: 2, created_at: Time.current)
oldest = create(:proposal, title: 'stop corruption', cached_votes_up: 3, created_at: 1.month.ago)
results = Proposal.search('stop corruption')
@@ -794,7 +794,7 @@ describe Proposal do
describe "retired" do
let!(:proposal1) { create(:proposal) }
let!(:proposal2) { create(:proposal, retired_at: Time.now) }
let!(:proposal2) { create(:proposal, retired_at: Time.current) }
it "retired? is true" do
expect(proposal1.retired?).to eq false

10
spec/models/user_spec.rb
View File

@@ -274,10 +274,10 @@ describe User do
# Subdomains are also accepted
Setting['email_domain_for_officials'] = 'officials.madrid.es'
user1 = create(:user, email: "john@officials.madrid.es", confirmed_at: Time.now)
user2 = create(:user, email: "john@yes.officials.madrid.es", confirmed_at: Time.now)
user3 = create(:user, email: "john@unofficials.madrid.es", confirmed_at: Time.now)
user4 = create(:user, email: "john@example.org", confirmed_at: Time.now)
user1 = create(:user, email: "john@officials.madrid.es", confirmed_at: Time.current)
user2 = create(:user, email: "john@yes.officials.madrid.es", confirmed_at: Time.current)
user3 = create(:user, email: "john@unofficials.madrid.es", confirmed_at: Time.current)
user4 = create(:user, email: "john@example.org", confirmed_at: Time.current)
expect(user1.has_official_email?).to eq(true)
expect(user2.has_official_email?).to eq(true)
@@ -332,7 +332,7 @@ describe User do
it "returns users that have not been erased" do
user1 = create(:user, erased_at: nil)
user2 = create(:user, erased_at: nil)
user3 = create(:user, erased_at: Time.now)
user3 = create(:user, erased_at: Time.current)
expect(User.active).to include(user1)
expect(User.active).to include(user2)

2
spec/support/common_actions.rb
View File

@@ -25,7 +25,7 @@ module CommonActions
end
def login_as_authenticated_manager
login, user_key, date = "JJB042", "31415926", Time.now.strftime("%Y%m%d%H%M%S")
login, user_key, date = "JJB042", "31415926", Time.current.strftime("%Y%m%d%H%M%S")
allow_any_instance_of(ManagerAuthenticator).to receive(:auth).and_return({login: login, user_key: user_key, date: date}.with_indifferent_access)
visit management_sign_in_path(login: login, clave_usuario: user_key, fecha_conexion: date)
end

44
spec/support/verifiable.rb
View File

@@ -4,7 +4,7 @@ shared_examples_for "verifiable" do
describe "#scopes" do
describe "#level_three_verified" do
it "returns level three verified users" do
user1 = create(:user, verified_at: Time.now)
user1 = create(:user, verified_at: Time.current)
user2 = create(:user, verified_at: nil)
expect(model.level_three_verified).to include(user1)
@@ -14,10 +14,10 @@ shared_examples_for "verifiable" do
describe "#level_two_verified" do
it "returns level two verified users" do
user1 = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.now)
user1 = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.current)
user2 = create(:user, confirmed_phone: "123456789", residence_verified_at: nil)
user3 = create(:user, confirmed_phone: nil, residence_verified_at: Time.now)
user4 = create(:user, level_two_verified_at: Time.now)
user3 = create(:user, confirmed_phone: nil, residence_verified_at: Time.current)
user4 = create(:user, level_two_verified_at: Time.current)
expect(model.level_two_verified).to include(user1)
expect(model.level_two_verified).to_not include(user2)
@@ -28,11 +28,11 @@ shared_examples_for "verifiable" do
describe "#level_two_or_three_verified" do
it "returns level two or three verified users" do
user1 = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.now)
user2 = create(:user, verified_at: Time.now)
user1 = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.current)
user2 = create(:user, verified_at: Time.current)
user3 = create(:user, confirmed_phone: "123456789", residence_verified_at: nil)
user4 = create(:user, confirmed_phone: nil, residence_verified_at: Time.now)
user5 = create(:user, level_two_verified_at: Time.now)
user4 = create(:user, confirmed_phone: nil, residence_verified_at: Time.current)
user5 = create(:user, level_two_verified_at: Time.current)
expect(model.level_two_or_three_verified).to include(user1)
expect(model.level_two_or_three_verified).to include(user2)
@@ -46,9 +46,9 @@ shared_examples_for "verifiable" do
it "returns unverified users" do
user1 = create(:user, verified_at: nil, confirmed_phone: nil)
user2 = create(:user, verified_at: nil, residence_verified_at: nil, confirmed_phone: "123456789")
user3 = create(:user, verified_at: nil, residence_verified_at: Time.now, confirmed_phone: nil)
user4 = create(:user, verified_at: Time.now, residence_verified_at: Time.now, confirmed_phone: "123456789")
user5 = create(:user, level_two_verified_at: Time.now)
user3 = create(:user, verified_at: nil, residence_verified_at: Time.current, confirmed_phone: nil)
user4 = create(:user, verified_at: Time.current, residence_verified_at: Time.current, confirmed_phone: "123456789")
user5 = create(:user, level_two_verified_at: Time.current)
expect(model.unverified).to include(user1)
expect(model.unverified).to include(user2)
@@ -63,9 +63,9 @@ shared_examples_for "verifiable" do
user1 = create(:user, verified_at: nil, confirmed_phone: nil)
create(:failed_census_call, user: user1)
user2 = create(:user, verified_at: nil, residence_verified_at: Time.now, unconfirmed_phone: nil)
user2 = create(:user, verified_at: nil, residence_verified_at: Time.current, unconfirmed_phone: nil)
user3 = create(:user, verified_at: nil, confirmed_phone: nil)
user4 = create(:user, verified_at: Time.now, residence_verified_at: Time.now, unconfirmed_phone: "123456789", confirmed_phone: "123456789")
user4 = create(:user, verified_at: Time.current, residence_verified_at: Time.current, unconfirmed_phone: "123456789", confirmed_phone: "123456789")
expect(model.incomplete_verification).to include(user1)
@@ -78,7 +78,7 @@ shared_examples_for "verifiable" do
describe "#methods" do
it "residence_verified? is true only if residence_verified_at" do
user = create(:user, residence_verified_at: Time.now)
user = create(:user, residence_verified_at: Time.current)
expect(user.residence_verified?).to eq(true)
user = create(:user, residence_verified_at: nil)
@@ -94,13 +94,13 @@ shared_examples_for "verifiable" do
end
it "level_two_verified? is true if manually set, or if residence_verified_at and confirmed_phone" do
user = create(:user, level_two_verified_at: Time.now)
user = create(:user, level_two_verified_at: Time.current)
expect(user.level_two_verified?).to eq(true)
user = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.now)
user = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.current)
expect(user.level_two_verified?).to eq(true)
user = create(:user, confirmed_phone: nil, residence_verified_at: Time.now)
user = create(:user, confirmed_phone: nil, residence_verified_at: Time.current)
expect(user.level_two_verified?).to eq(false)
user = create(:user, confirmed_phone: "123456789", residence_verified_at: nil)
@@ -108,7 +108,7 @@ shared_examples_for "verifiable" do
end
it "level_three_verified? is true only if verified_at" do
user = create(:user, verified_at: Time.now)
user = create(:user, verified_at: Time.current)
expect(user.level_three_verified?).to eq(true)
user = create(:user, verified_at: nil)
@@ -119,7 +119,7 @@ shared_examples_for "verifiable" do
user = create(:user, verified_at: nil, confirmed_phone: nil)
expect(user.unverified?).to eq(true)
user = create(:user, verified_at: Time.now, confirmed_phone: "123456789", residence_verified_at: Time.now)
user = create(:user, verified_at: Time.current, confirmed_phone: "123456789", residence_verified_at: Time.current)
expect(user.unverified?).to eq(false)
end
@@ -146,13 +146,13 @@ shared_examples_for "verifiable" do
end
it "verification_letter_sent? is true only if user has letter_requested_at and letter_verification_code" do
user = create(:user, letter_requested_at: Time.now, letter_verification_code: "666")
user = create(:user, letter_requested_at: Time.current, letter_verification_code: "666")
expect(user.verification_letter_sent?).to eq(true)
user = create(:user, letter_requested_at: nil, letter_verification_code: "666")
expect(user.verification_letter_sent?).to eq(false)
user = create(:user, letter_requested_at: Time.now, letter_verification_code: nil)
user = create(:user, letter_requested_at: Time.current, letter_verification_code: nil)
expect(user.verification_letter_sent?).to eq(false)
user = create(:user, letter_requested_at: nil, letter_verification_code: nil)
@@ -160,4 +160,4 @@ shared_examples_for "verifiable" do
end
end
end
end