Extracted Splashpage from Conference

#418
This commit is contained in:
Chrisbr 2014-08-30 12:08:24 +02:00
parent 7793497862
commit fedb0753bf
42 changed files with 578 additions and 236 deletions

View file

@ -6,8 +6,8 @@ describe 'User' do
subject(:ability){ Ability.new(user) }
let!(:first_user) { create(:user) } # automatically becomes admin
let(:user){ nil }
let(:conference_not_public) { create(:conference, make_conference_public: false) }
let(:conference_public) { create(:conference, make_conference_public: true)}
let(:conference_not_public) { create(:conference, splashpage: create(:splashpage, public: false)) }
let(:conference_public) { create(:conference, splashpage: create(:splashpage, public: true)) }
let(:event_confirmed) { create(:event, state: 'confirmed') }
let(:someevent) { create(:event) }
@ -113,8 +113,8 @@ describe 'User' do
let!(:conference2) { create(:conference) } # user is cfp
let!(:conference3) { create(:conference) } # user is info_desk
let!(:conference4) { create(:conference) } # user is volunteer coordinator
let!(:conference5) { create(:conference, make_conference_public: true) } # user has no role
let!(:conference6) { create(:conference, make_conference_public: false) } # user has no role
let!(:conference5) { create(:conference, splashpage: create(:splashpage, public: true)) } # user has no role
let!(:conference6) { create(:conference, splashpage: create(:splashpage, public: false)) } # user has no role
let(:role_organizer) { create(:role, name: 'organizer', resource: conference1) }
let(:role_cfp) { create(:role, name: 'cfp', resource: conference2) }
let(:role_info_desk) { create(:role, name: 'info_desk', resource: conference3) }

View file

@ -952,7 +952,7 @@ describe Conference do
@result['tracks'] = true
@result['event_types'] = true
@result['difficulty_levels'] = true
@result['make_conference_public'] = true
@result['splashpage'] = true
# Setup negative result hash
@result_false = Hash.new
@ -970,7 +970,7 @@ describe Conference do
subject.tracks = []
subject.event_types = []
subject.difficulty_levels = []
subject.make_conference_public = false
subject.splashpage = create(:splashpage, public: false)
expect(subject.get_status).to eq(@result_false)
end
@ -984,7 +984,7 @@ describe Conference do
subject.tracks = []
subject.event_types = []
subject.difficulty_levels = []
subject.make_conference_public = false
subject.splashpage = create(:splashpage, public: false)
@result_false['registration'] = true
@result_false['process'] = 13.to_s
@ -1001,7 +1001,7 @@ describe Conference do
subject.tracks = []
subject.event_types = []
subject.difficulty_levels = []
subject.make_conference_public = false
subject.splashpage = create(:splashpage, public: false)
@result_false['cfp'] = true
@result_false['registration'] = true
@ -1020,7 +1020,7 @@ describe Conference do
subject.tracks = []
subject.event_types = []
subject.difficulty_levels = []
subject.make_conference_public = false
subject.splashpage = create(:splashpage, public: false)
@result_false['cfp'] = true
@result_false['registration'] = true
@ -1040,7 +1040,7 @@ describe Conference do
subject.tracks = []
subject.event_types = []
subject.difficulty_levels = []
subject.make_conference_public = false
subject.splashpage = create(:splashpage, public: false)
@result_false['cfp'] = true
@result_false['registration'] = true
@ -1061,7 +1061,7 @@ describe Conference do
subject.venue = create(:venue)
subject.event_types = []
subject.difficulty_levels = []
subject.make_conference_public = false
subject.splashpage = create(:splashpage, public: false)
@result_false['cfp'] = true
@result_false['registration'] = true
@ -1084,7 +1084,7 @@ describe Conference do
subject.call_for_papers = create(:call_for_papers)
subject.venue = create(:venue)
subject.difficulty_levels = []
subject.make_conference_public = false
subject.splashpage = create(:splashpage, public: false)
@result_false['cfp'] = true
@result_false['registration'] = true
@ -1108,7 +1108,7 @@ describe Conference do
subject.venue = create(:venue)
subject.call_for_papers = create(:call_for_papers)
subject.venue = create(:venue)
subject.make_conference_public = true
subject.splashpage = create(:splashpage, public: true)
expect(subject.get_status).to eq(@result)
end