created current scope in event_schedule model and conference info link name and path changed

This commit is contained in:
AnithaPal 2016-08-23 10:23:26 -04:00
parent e8d3177ec1
commit e82a3e1727
17 changed files with 53 additions and 65 deletions

View file

@ -20,5 +20,20 @@ FactoryGirl.define do
event_schedule.schedule = program.selected_schedule
end
end
factory :current_event_schedule do
after(:build) do |event_schedule|
event_schedule.start_time = DateTime.current
end
end
factory :past_event_schedule do
after(:build) do |event_schedule|
event_schedule.start_time = (DateTime.current - 2.days).to_s
end
end
factory :future_event_schedule do
after(:build) do |event_schedule|
event_schedule.start_time = (DateTime.current + 2.days).to_s
end
end
end
end

View file

@ -33,19 +33,6 @@ FactoryGirl.define do
event.event_schedules << build(:event_schedule, event: event)
end
end
factory :past_event do
after(:build) do |event|
event.start_time = (DateTime.current - 2.days).to_s
event.state = 'confirmed'
end
end
factory :future_event do
after(:build) do |event|
event.start_time = (DateTime.current + 2.days).to_s
event.state = 'confirmed'
end
end
end
end
end

View file

@ -1,6 +1,12 @@
require 'spec_helper'
describe EventSchedule do
subject { create(:event_schedule) }
let(:schedule) { create(:schedule) }
let(:program) { create(:program, selected_schedule: schedule) }
let!(:current_event_schedule) { create(:current_event_schedule, schedule: program.selected_schedule) }
let!(:past_event_schedule) { create(:past_event_schedule) }
let!(:future_event_schedule) { create(:future_event_schedule) }
describe 'association' do
it { should belong_to(:schedule) }
@ -18,4 +24,12 @@ describe EventSchedule do
it { is_expected.to validate_presence_of(:room) }
it { is_expected.to validate_presence_of(:start_time) }
end
describe 'scope' do
context 'current' do
it 'returns only current events' do
expect(program.selected_schedule.event_schedules.current).to match_array([current_event_schedule])
end
end
end
end

View file

@ -114,14 +114,6 @@ describe Event do
expect(conference.program.events.highlighted).to eq [my_event]
end
end
context 'current' do
it 'returns only current events' do
current_event = create(:event, start_time: Time.current.to_s, state: 'confirmed', program: conference.program)
create(:past_event, program: conference.program)
create(:future_event, program: conference.program)
expect(conference.program.events.current).to match_array([current_event])
end
end
end
describe '#scheduled?' do

View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe Schedule do
describe 'association' do
it { should belong_to(:program) }
it { should have_many(:event_schedules).dependent(:destroy) }