gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement consistent admin interface

Browse source 
* Consistent route/model/controller/view layout
* Get rid of unused photos, speakers, dietchoices, social_events controllers
* Drop unused :public from Rooms and :description from CallForPapers
This commit is contained in:
Henne Vogelsang 2014-11-25 10:47:18 +01:00
parent f6a87331be
commit 28063129c7
133 changed files with 1461 additions and 1461 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/models/ability_spec.rb
View file

@ -94,7 +94,7 @@ describe 'User' do
let(:user) { create(:user, role_ids: role.id) }
let(:event) { create(:event, conference_id: conference1.id) }
let(:someevent) { create(:event, conference_id: conference2.id) }
let(:cfp) { create(:call_for_papers, conference: conference1) }
let(:cfp) { create(:call_for_paper, conference: conference1) }
it{ should_not be_able_to(:manage, conference1) }
it{ should_not be_able_to(:manage, conference2) }

82
spec/models/conference_spec.rb
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.call_for_papers = create(:call_for_papers, start_date: Date.today - 3.weeks)
subject.call_for_paper = create(:call_for_paper, start_date: Date.today - 3.weeks)
create(:event, conference: subject, created_at: Date.today)
options = {}
@ -115,7 +115,7 @@ describe Conference do
}
subject.events_per_week = db_data
subject.save
subject.call_for_papers = create(:call_for_papers, start_date: Date.today - 3.weeks)
subject.call_for_paper = create(:call_for_paper, start_date: Date.today - 3.weeks)
create(:event, conference: subject, created_at: Date.today)
unconfirmed = create(:event, conference: subject)
@ -186,7 +186,7 @@ describe Conference do
subject.events_per_week = db_data
subject.save
subject.call_for_papers = create(:call_for_papers, start_date: Date.today - 2.weeks)
subject.call_for_paper = create(:call_for_paper, start_date: Date.today - 2.weeks)
create(:event, conference: subject, 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.call_for_papers = create(:call_for_papers, start_date: Date.today)
subject.call_for_paper = create(:call_for_paper, start_date: Date.today)
create(:event, conference: subject)
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.call_for_papers = create(:call_for_papers, start_date: Date.today - 3.weeks)
subject.call_for_paper = create(:call_for_paper, start_date: Date.today - 3.weeks)
create(:event, conference: subject, created_at: Date.today)
unconfirmed = create(:event, conference: subject)
@ -258,7 +258,7 @@ describe Conference do
subject.events_per_week = db_data
subject.save
subject.call_for_papers = create(:call_for_papers, start_date: Date.today - 3.weeks)
subject.call_for_paper = create(:call_for_paper, start_date: Date.today - 3.weeks)
create(:event, conference: subject, created_at: Date.today - 3.weeks)
@ -964,7 +964,7 @@ describe Conference do
end
it 'calculates correct for new conference' do
subject.call_for_papers = nil
subject.call_for_paper = nil
subject.venue = nil
subject.rooms = []
subject.tracks = []
@ -979,7 +979,7 @@ describe Conference do
subject.registration_period = create(:registration_period,
start_date: Date.today,
end_date: Date.today + 14)
subject.call_for_papers = nil
subject.call_for_paper = nil
subject.venue = nil
subject.rooms = []
subject.tracks = []
@ -997,7 +997,7 @@ describe Conference do
subject.registration_period = create(:registration_period,
start_date: Date.today,
end_date: Date.today + 14)
subject.call_for_papers = create(:call_for_papers)
subject.call_for_paper = create(:call_for_paper)
subject.venue = nil
subject.rooms = []
subject.tracks = []
@ -1016,7 +1016,7 @@ describe Conference do
subject.registration_period = create(:registration_period,
start_date: Date.today,
end_date: Date.today + 14)
subject.call_for_papers = create(:call_for_papers)
subject.call_for_paper = create(:call_for_paper)
subject.venue = create(:venue)
subject.rooms = []
subject.tracks = []
@ -1037,7 +1037,7 @@ describe Conference do
subject.registration_period = create(:registration_period,
start_date: Date.today,
end_date: Date.today + 14)
subject.call_for_papers = create(:call_for_papers)
subject.call_for_paper = create(:call_for_paper)
subject.venue = create(:venue)
subject.tracks = []
subject.event_types = []
@ -1059,7 +1059,7 @@ describe Conference do
subject.registration_period = create(:registration_period,
start_date: Date.today,
end_date: Date.today + 14)
subject.call_for_papers = create(:call_for_papers)
subject.call_for_paper = create(:call_for_paper)
subject.venue = create(:venue)
subject.event_types = []
subject.difficulty_levels = []
@ -1083,7 +1083,7 @@ describe Conference do
subject.registration_period = create(:registration_period,
start_date: Date.today,
end_date: Date.today + 14)
subject.call_for_papers = create(:call_for_papers)
subject.call_for_paper = create(:call_for_paper)
subject.venue = create(:venue)
subject.difficulty_levels = []
subject.splashpage = create(:splashpage, public: false)
@ -1108,7 +1108,7 @@ describe Conference do
start_date: Date.today,
end_date: Date.today + 14)
subject.venue = create(:venue)
subject.call_for_papers = create(:call_for_papers)
subject.call_for_paper = create(:call_for_paper)
subject.venue = create(:venue)
subject.splashpage = create(:splashpage, public: true)
@ -1150,34 +1150,34 @@ describe Conference do
describe '#cfp_weeks' do
it 'calculates new year' do
cfp = create(:call_for_papers)
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2013, 12, 30)
cfp.end_date = Date.new(2013, 12, 30) + 6
subject.call_for_papers = cfp
subject.call_for_paper = cfp
expect(subject.cfp_weeks).to eq(1)
end
it 'is one if start and end are 6 days apart' do
cfp = create(:call_for_papers)
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 6
subject.call_for_papers = cfp
subject.call_for_paper = cfp
expect(subject.cfp_weeks).to eq(1)
end
it 'is one if start and end are the same date' do
cfp = create(:call_for_papers)
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26)
subject.call_for_papers = cfp
subject.call_for_paper = cfp
expect(subject.cfp_weeks).to eq(1)
end
it 'is two if start and end are 10 days apart' do
cfp = create(:call_for_papers)
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 10
subject.call_for_papers = cfp
subject.call_for_paper = cfp
expect(subject.cfp_weeks).to eq(2)
end
end
@ -1185,36 +1185,36 @@ describe Conference do
describe '#get_submissions_per_week' do
it 'does calculate correct if cfp start date is altered' do
cfp = create(:call_for_papers)
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.call_for_papers = cfp
subject.call_for_paper = cfp
subject.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(:call_for_papers)
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.call_for_papers = cfp
subject.call_for_paper = cfp
subject.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(:call_for_papers)
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.call_for_papers = cfp
subject.call_for_paper = cfp
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(:call_for_papers)
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 28
subject.call_for_papers = cfp
subject.call_for_paper = cfp
subject.events += [create(:event, created_at: Date.new(2014, 05, 26) + 7)]
subject.events += [create(:event, created_at: Date.new(2014, 05, 26) + 14)]
subject.events += [create(:event, created_at: Date.new(2014, 05, 26) + 28)]
@ -1222,20 +1222,20 @@ describe Conference do
end
it 'summarized correct if there are submissions every week except the first' do
cfp = create(:call_for_papers)
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.call_for_papers = cfp
subject.call_for_paper = cfp
subject.events += [create(:event, created_at: Date.new(2014, 05, 26) + 7)]
subject.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(:call_for_papers)
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.call_for_papers = cfp
subject.call_for_paper = cfp
subject.events += [create(:event, created_at: Date.new(2014, 05, 26))]
subject.events += [create(:event, created_at: Date.new(2014, 05, 26) + 7)]
subject.events += [create(:event, created_at: Date.new(2014, 05, 26) + 14)]
@ -1243,29 +1243,29 @@ describe Conference do
end
it 'pads left' do
cfp = create(:call_for_papers)
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.call_for_papers = cfp
subject.call_for_paper = cfp
subject.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(:call_for_papers)
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.call_for_papers = cfp
subject.call_for_paper = cfp
subject.events += [create(:event, created_at: Date.new(2014, 05, 26))]
subject.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(:call_for_papers)
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2014, 05, 26)
cfp.end_date = Date.new(2014, 05, 26) + 21
subject.call_for_papers = cfp
subject.call_for_paper = cfp
subject.events += [create(:event, created_at: Date.new(2014, 05, 26))]
expect(subject.get_submissions_per_week).to eq([1, 1, 1, 1])
end
@ -1433,7 +1433,7 @@ describe Conference do
context 'open cfp' do
before do
subject.call_for_papers = create(:call_for_papers)
subject.call_for_paper = create(:call_for_paper)
end
it '#registration_open? is true' do

14
spec/models/photo_spec.rb
View file

@ -1,14 +0,0 @@
require 'spec_helper'
describe Photo do
describe 'validations' do
it 'has a valid factory' do
expect(build(:photo)).to be_valid
end
it 'is not valid without a picture' do
should validate_presence_of(:picture)
end
end
end