From a6d4d51b03987d8608af500d20383b365f1e0474 Mon Sep 17 00:00:00 2001 From: Hernan Schmidt Date: Wed, 17 Aug 2016 18:49:00 +0200 Subject: [PATCH] Fix model specs to work with MySQL --- spec/models/campaign_spec.rb | 2 +- spec/models/conference_spec.rb | 4 ++-- spec/models/sponsorship_level_spec.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/models/campaign_spec.rb b/spec/models/campaign_spec.rb index 0bf30aa5..4127371a 100644 --- a/spec/models/campaign_spec.rb +++ b/spec/models/campaign_spec.rb @@ -36,7 +36,7 @@ describe Campaign do campaign.conference = build(:conference) create(:visit, utm_source: 'google+', utm_medium: 'advertisement', - utm_term: 'opensource', utm_content: 'content', utm_campaign: '20percent', started_at: Time.now) + utm_term: 'opensource', utm_content: 'content', utm_campaign: '20percent', started_at: Time.now + 1.hour) expect(campaign.visits_count).to eq(1) end diff --git a/spec/models/conference_spec.rb b/spec/models/conference_spec.rb index e1ce4328..8aebc0cd 100755 --- a/spec/models/conference_spec.rb +++ b/spec/models/conference_spec.rb @@ -906,7 +906,7 @@ describe Conference do let!(:organizer) { create(:user, role_ids: [organizer_role.id]) } it 'self#event_distribution calculates correct values with user' do - create(:user, last_sign_in_at: Date.today - 3.months) # active + create(:user, last_sign_in_at: Date.today - 3.months + 1.day) # active create(:user, confirmed_at: nil) # unconfirmed create(:user, last_sign_in_at: Date.today - 1.year - 1.day) # dead result = {} @@ -918,7 +918,7 @@ describe Conference do end it 'self#event_distribution calculates correct with only active user' do - create(:user, last_sign_in_at: Date.today - 3.months) # active + create(:user, last_sign_in_at: Date.today - 3.months + 1.day) # active result = {} result['Active'] = { 'color' => 'green', 'value' => 1 } diff --git a/spec/models/sponsorship_level_spec.rb b/spec/models/sponsorship_level_spec.rb index 9ca74b47..2284d4ba 100644 --- a/spec/models/sponsorship_level_spec.rb +++ b/spec/models/sponsorship_level_spec.rb @@ -29,13 +29,13 @@ describe SponsorshipLevel do it 'is positions sponsorship_levels in order' do expect(SponsorshipLevel.where(conference_id: conference.id).order(:position).map(&:id)) - .to eq [2, 1, 3] + .to eq [@second_sponsorship_level.id, @first_sponsorship_level.id, @third_sponsorship_level.id] end it 'maintains order after deleting one element' do @first_sponsorship_level.destroy expect(SponsorshipLevel.where(conference_id: conference.id).order(:position).map(&:id)) - .to eq [2, 3] + .to eq [@second_sponsorship_level.id, @third_sponsorship_level.id] end end end