Fix rspec tests because of the changes to the cfp

Remove redundant association
Note: a conference created with :full_conference already has a cfp
This commit is contained in:
AEtherC0r3 2017-06-01 01:11:28 +03:00 committed by Stella Rouzi
parent 2bff918556
commit a1124546f1
16 changed files with 78 additions and 74 deletions

View file

@ -10,7 +10,6 @@ describe 'User' do
let(:user){ nil }
let!(:my_conference) { create(:full_conference) }
let!(:my_cfp) { create(:cfp, program: my_conference.program) }
let(:my_venue) { my_conference.venue || create(:venue, conference: my_conference) }
let(:my_registration) { create(:registration, conference: my_conference, user: admin) }
@ -22,7 +21,6 @@ describe 'User' do
let(:conference_not_public) { create(:conference, splashpage: create(:splashpage, public: false)) }
let(:conference_public) { create(:full_conference, splashpage: create(:splashpage, public: true)) }
let!(:conference_public_cfp) { create(:cfp, program: conference_public.program) }
let(:event_confirmed) { create(:event, state: 'confirmed') }
let(:event_unconfirmed) { create(:event) }
@ -32,7 +30,7 @@ describe 'User' do
let(:resource) { create(:resource, conference: my_conference)}
let(:registration) { create(:registration) }
let(:program_with_cfp) { create(:program, cfp: create(:cfp)) }
let(:program_with_cfp) { create(:program, :with_cfp) }
let(:program_without_cfp) { create(:program) }
let(:conference_with_open_registration) { create(:conference) }
let!(:open_registration_period) { create(:registration_period, conference: conference_with_open_registration, start_date: Date.current - 6.days) }

View file

@ -48,7 +48,7 @@ describe Conference do
subject.start_date = Date.today + 6.weeks
subject.end_date = Date.today + 7.weeks
subject.save
subject.program.cfp = create(:cfp, start_date: Date.today - 3.weeks)
create(:cfp, start_date: Date.today - 3.weeks, program: subject.program)
create(:event, program: subject.program, created_at: Date.today)
options = {}
@ -115,7 +115,7 @@ describe Conference do
}
subject.events_per_week = db_data
subject.save
subject.program.cfp = create(:cfp, start_date: Date.today - 3.weeks)
create(:cfp, start_date: Date.today - 3.weeks, program: subject.program)
create(:event, program: subject.program, created_at: Date.today)
unconfirmed = create(:event, program: subject.program)
@ -186,7 +186,7 @@ describe Conference do
subject.events_per_week = db_data
subject.save
subject.program.cfp = create(:cfp, start_date: Date.today - 2.weeks)
create(:cfp, start_date: Date.today - 2.weeks, program: subject.program)
create(:event, program: subject.program, created_at: Date.today - 2.weeks)
@ -203,7 +203,7 @@ describe Conference do
subject.start_date = Date.today + 6.weeks
subject.end_date = Date.today + 7.weeks
subject.save
subject.program.cfp = create(:cfp, start_date: Date.today)
create(:cfp, start_date: Date.today, program: subject.program)
create(:event, program: subject.program)
result = {
@ -220,7 +220,7 @@ describe Conference do
subject.start_date = Date.today + 6.weeks
subject.end_date = Date.today + 7.weeks
subject.save
subject.program.cfp = create(:cfp, start_date: Date.today - 3.weeks)
create(:cfp, start_date: Date.today - 3.weeks, program: subject.program)
create(:event, program: subject.program, created_at: Date.today)
unconfirmed = create(:event, program: subject.program)
@ -258,7 +258,7 @@ describe Conference do
subject.events_per_week = db_data
subject.save
subject.program.cfp = create(:cfp, start_date: Date.today - 3.weeks)
create(:cfp, start_date: Date.today - 3.weeks, program: subject.program)
create(:event, program: subject.program, created_at: Date.today - 3.weeks)
@ -992,7 +992,6 @@ describe Conference do
end
it 'calculates correct for new conference' do
subject.program.cfp = nil
subject.venue = nil
subject.program.tracks = []
subject.program.event_types = []
@ -1006,7 +1005,6 @@ describe Conference do
subject.registration_period = create(:registration_period,
start_date: subject.end_date - 14,
end_date: subject.end_date, conference: subject)
subject.program.cfp = nil
subject.venue = nil
subject.program.event_types = []
subject.program.tracks = []
@ -1024,7 +1022,7 @@ describe Conference do
subject.registration_period = create(:registration_period,
start_date: subject.end_date - 14,
end_date: subject.end_date, conference: subject)
subject.program.cfp = create(:cfp)
create(:cfp, program: subject.program)
subject.venue = nil
subject.program.tracks = []
subject.program.event_types = []
@ -1043,7 +1041,7 @@ describe Conference do
subject.registration_period = create(:registration_period,
start_date: subject.end_date - 14,
end_date: subject.end_date, conference: subject)
subject.program.cfp = create(:cfp)
create(:cfp, program: subject.program)
subject.venue = create(:venue, conference: subject)
subject.venue.rooms = []
subject.program.tracks = []
@ -1063,7 +1061,7 @@ describe Conference do
subject.registration_period = create(:registration_period,
start_date: Date.today,
end_date: Date.today + 14, conference: subject)
subject.program.cfp = create(:cfp)
create(:cfp, program: subject.program)
subject.venue = create(:venue, conference: subject)
subject.venue.rooms = [create(:room, venue: subject.venue)]
subject.program.tracks = []
@ -1087,7 +1085,7 @@ describe Conference do
subject.registration_period = create(:registration_period,
start_date: Date.today,
end_date: Date.today + 14, conference: subject)
subject.program.cfp = create(:cfp)
create(:cfp, program: subject.program)
subject.program.event_types = []
subject.program.difficulty_levels = []
subject.splashpage = create(:splashpage, public: false)
@ -1109,7 +1107,7 @@ describe Conference do
subject.registration_period = create(:registration_period,
start_date: Date.today,
end_date: Date.today + 14, conference: subject)
subject.program.cfp = create(:cfp)
create(:cfp, program: subject.program)
subject.venue = create(:venue, conference: subject)
subject.venue.rooms = [create(:room, venue: subject.venue)]
subject.program.difficulty_levels = []
@ -1133,7 +1131,7 @@ describe Conference do
subject.registration_period = create(:registration_period,
start_date: Date.today,
end_date: Date.today + 14, conference: subject)
subject.program.cfp = create(:cfp)
create(:cfp, program: subject.program)
subject.venue = create(:venue, conference: subject)
subject.venue.rooms = [create(:room, venue: subject.venue)]
subject.splashpage = create(:splashpage, public: true)
@ -1176,34 +1174,34 @@ describe Conference do
describe '#cfp_weeks' do
it 'calculates new year' do
cfp = create(:cfp)
cfp = create(:cfp, program: subject.program)
cfp.start_date = Date.new(2013, 12, 30)
cfp.end_date = Date.new(2013, 12, 30) + 6
subject.program.cfp = cfp
cfp.save!
expect(subject.cfp_weeks).to eq(1)
end
it 'is one if start and end are 6 days apart' do
cfp = create(:cfp)
cfp = create(:cfp, program: subject.program)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 6
subject.program.cfp = cfp
cfp.save!
expect(subject.cfp_weeks).to eq(1)
end
it 'is one if start and end are the same date' do
cfp = create(:cfp)
cfp = create(:cfp, program: subject.program)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26)
subject.program.cfp = cfp
cfp.save!
expect(subject.cfp_weeks).to eq(1)
end
it 'is two if start and end are 10 days apart' do
cfp = create(:cfp)
cfp = create(:cfp, program: subject.program)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 10
subject.program.cfp = cfp
cfp.save!
expect(subject.cfp_weeks).to eq(2)
end
end
@ -1211,36 +1209,36 @@ describe Conference do
describe '#get_submissions_per_week' do
it 'does calculate correct if cfp start date is altered' do
cfp = create(:cfp)
cfp = create(:cfp, program: subject.program)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.program.cfp = cfp
cfp.save!
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26) - 7)]
expect(subject.get_submissions_per_week).to eq([1, 1, 1, 1, 1])
end
it 'does calculate correct if cfp end date is altered' do
cfp = create(:cfp)
cfp = create(:cfp, program: subject.program)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.program.cfp = cfp
cfp.save!
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26) + 28)]
expect(subject.get_submissions_per_week).to eq([0, 0, 0, 0, 1])
end
it 'pads with zeros if there are no submissions' do
cfp = create(:cfp)
cfp = create(:cfp, program: subject.program)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.program.cfp = cfp
cfp.save!
expect(subject.get_submissions_per_week).to eq([0, 0, 0, 0])
end
it 'summarized correct if there are no submissions in one week' do
cfp = create(:cfp)
cfp = create(:cfp, program: subject.program)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 28
subject.program.cfp = cfp
cfp.save!
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26) + 7)]
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26) + 14)]
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26) + 28)]
@ -1248,20 +1246,20 @@ describe Conference do
end
it 'summarized correct if there are submissions every week except the first' do
cfp = create(:cfp)
cfp = create(:cfp, program: subject.program)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.program.cfp = cfp
cfp.save!
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26) + 7)]
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26) + 14)]
expect(subject.get_submissions_per_week).to eq([0, 1, 2, 2])
end
it 'summarized correct if there are submissions every week' do
cfp = create(:cfp)
cfp = create(:cfp, program: subject.program)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.program.cfp = cfp
cfp.save!
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26))]
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26) + 7)]
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26) + 14)]
@ -1269,29 +1267,29 @@ describe Conference do
end
it 'pads left' do
cfp = create(:cfp)
cfp = create(:cfp, program: subject.program)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.program.cfp = cfp
cfp.save!
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26) + 21)]
expect(subject.get_submissions_per_week).to eq([0, 0, 0, 1])
end
it 'pads middle' do
cfp = create(:cfp)
cfp = create(:cfp, program: subject.program)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.program.cfp = cfp
cfp.save!
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26))]
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26) + 21)]
expect(subject.get_submissions_per_week).to eq([1, 1, 1, 2])
end
it 'pads right' do
cfp = create(:cfp)
cfp = create(:cfp, program: subject.program)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.program.cfp = cfp
cfp.save!
subject.program.events += [create(:event, created_at: Date.new(2014, 05, 26))]
expect(subject.get_submissions_per_week).to eq([1, 1, 1, 1])
end
@ -1460,7 +1458,7 @@ describe Conference do
context 'open cfp' do
before do
subject.program.cfp = create(:cfp)
create(:cfp, program: subject.program)
end
it '#registration_open? is true' do

View file

@ -46,9 +46,10 @@ describe EmailSettings do
context 'conference has cfp' do
before do
conference.program.update_attributes(cfp: create(:cfp,
start_date: Date.new(2014, 04, 29),
end_date: Date.new(2014, 05, 06)))
create(:cfp,
start_date: Date.new(2014, 04, 29),
end_date: Date.new(2014, 05, 06),
program: conference.program)
cfp_dates_hash = { 'cfp_start_date' => Date.new(2014, 04, 29), 'cfp_end_date' => Date.new(2014, 05, 06) }
expected_hash.merge!(cfp_dates_hash)
end

View file

@ -7,7 +7,7 @@ describe Program do
describe 'association' do
it { is_expected.to belong_to :conference }
it { is_expected.to have_one(:cfp).dependent(:destroy) }
it { is_expected.to have_many(:cfps).dependent(:destroy) }
it { is_expected.to have_many(:schedules).dependent(:destroy) }
it { is_expected.to have_many(:event_types).dependent(:destroy) }
it { is_expected.to have_many(:tracks).dependent(:destroy) }

View file

@ -29,7 +29,6 @@ describe 'Registration' do
describe 'association' do
it { is_expected.to belong_to(:user) }
it { is_expected.to belong_to(:conference) }
it { is_expected.to have_and_belong_to_many(:events) }
it { is_expected.to have_and_belong_to_many(:qanswers) }
it { is_expected.to have_and_belong_to_many(:vchoices) }
it { is_expected.to have_many(:events_registrations) }