diff --git a/app/models/conference.rb b/app/models/conference.rb index 8c83f286..bb028574 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -156,7 +156,7 @@ class Conference < ApplicationRecord def get_submissions_per_week result = [] - if program&.cfp && program&.events + if program&.cfp && program.events submissions = program.events.select(:week).group(:week).order(:week).count start_week = program.cfp.start_week weeks = program.cfp.weeks @@ -172,7 +172,7 @@ class Conference < ApplicationRecord # ====Returns # * +Array+ -> e.g. 'Submitted' => [0, 3, 3, 5] -> first week 0 events, second week 3 events. def get_submissions_data - return [] unless program&.cfp && program&.events + return [] unless program&.cfp && program.events start_week = program.cfp.start_week get_events_per_week_by_state.collect do |state, values| @@ -265,7 +265,7 @@ class Conference < ApplicationRecord result = 0 weeks = 0 if registration_period&.start_date && - registration_period&.end_date + registration_period.end_date weeks = Date.new(registration_period.start_date.year, 12, 31) .strftime('%W').to_i diff --git a/spec/features/cfp_ability_spec.rb b/spec/features/cfp_ability_spec.rb index 2dd059cb..5c92250d 100644 --- a/spec/features/cfp_ability_spec.rb +++ b/spec/features/cfp_ability_spec.rb @@ -18,11 +18,11 @@ feature 'Has correct abilities' do expect(current_path).to eq(admin_conference_path(conference.short_title)) expect(page).to have_selector('li.nav-header.nav-header-bigger a', text: 'Dashboard') - expect(page).to_not have_link('Basics', href: "/admin/conferences/#{conference.short_title}/edit") + expect(page).to have_no_link('Basics', href: "/admin/conferences/#{conference.short_title}/edit") expect(page).to have_text('Basics') - expect(page).to_not have_link('Contact', href: "/admin/conferences/#{conference.short_title}/contact/edit") + expect(page).to have_no_link('Contact', href: "/admin/conferences/#{conference.short_title}/contact/edit") expect(page).to have_link('Commercials', href: "/admin/conferences/#{conference.short_title}/commercials") - expect(page).to_not have_link('Splashpage', href: "/admin/conferences/#{conference.short_title}/splashpage") + expect(page).to have_no_link('Splashpage', href: "/admin/conferences/#{conference.short_title}/splashpage") expect(page).to have_link('Venue', href: "/admin/conferences/#{conference.short_title}/venue") expect(page).to have_link('Rooms', href: "/admin/conferences/#{conference.short_title}/venue/rooms") expect(page).to have_link('Program', href: "/admin/conferences/#{conference.short_title}/program") @@ -33,18 +33,18 @@ feature 'Has correct abilities' do expect(page).to have_link('Difficulty Levels', href: "/admin/conferences/#{conference.short_title}/program/difficulty_levels") expect(page).to have_link('Schedules', href: "/admin/conferences/#{conference.short_title}/schedules") expect(page).to have_link('Reports', href: "/admin/conferences/#{conference.short_title}/program/reports") - expect(page).to_not have_link('Registrations', href: "/admin/conferences/#{conference.short_title}/registrations") - expect(page).to_not have_link('Questions', href: "/admin/conferences/#{conference.short_title}/questions") + expect(page).to have_no_link('Registrations', href: "/admin/conferences/#{conference.short_title}/registrations") + expect(page).to have_no_link('Questions', href: "/admin/conferences/#{conference.short_title}/questions") expect(page).to have_link('E-Mails', href: "/admin/conferences/#{conference.short_title}/emails") - expect(page).to_not have_link('Lodgings', href: "/admin/conferences/#{conference.short_title}/lodgings") - expect(page).to_not have_link('Registration Period', href: "/admin/conferences/#{conference.short_title}/registration_period") - expect(page).to_not have_text('Donations') - expect(page).to_not have_link('Sponsorship Levels', href: "/admin/conferences/#{conference.short_title}/sponsorship_levels") - expect(page).to_not have_link('Sponsors', href: "/admin/conferences/#{conference.short_title}/sponsors") - expect(page).to_not have_link('Tickets', href: "/admin/conferences/#{conference.short_title}/tickets") + expect(page).to have_no_link('Lodgings', href: "/admin/conferences/#{conference.short_title}/lodgings") + expect(page).to have_no_link('Registration Period', href: "/admin/conferences/#{conference.short_title}/registration_period") + expect(page).to have_no_text('Donations') + expect(page).to have_no_link('Sponsorship Levels', href: "/admin/conferences/#{conference.short_title}/sponsorship_levels") + expect(page).to have_no_link('Sponsors', href: "/admin/conferences/#{conference.short_title}/sponsors") + expect(page).to have_no_link('Tickets', href: "/admin/conferences/#{conference.short_title}/tickets") expect(page).to have_link('Roles', href: "/admin/conferences/#{conference.short_title}/roles") expect(page).to have_link('Resources', href: "/admin/conferences/#{conference.short_title}/resources") - expect(page).to_not have_link('New Conference', href: '/admin/conferences/new') + expect(page).to have_no_link('New Conference', href: '/admin/conferences/new') visit admin_conference_venue_rooms_path(conference.short_title) expect(current_path).to eq(admin_conference_venue_rooms_path(conference.short_title)) diff --git a/spec/features/info_desk_ability_spec.rb b/spec/features/info_desk_ability_spec.rb index daf89066..a65cdabc 100644 --- a/spec/features/info_desk_ability_spec.rb +++ b/spec/features/info_desk_ability_spec.rb @@ -17,34 +17,34 @@ feature 'Has correct abilities' do visit admin_conference_path(conference.short_title) expect(current_path).to eq(admin_conference_path(conference.short_title)) - expect(page).to_not have_link('Basics', href: "/admin/conferences/#{conference.short_title}/edit") + expect(page).to have_no_link('Basics', href: "/admin/conferences/#{conference.short_title}/edit") expect(page).to have_text('Basics') - expect(page).to_not have_link('Contact', href: "/admin/conferences/#{conference.short_title}/contact/edit") + expect(page).to have_no_link('Contact', href: "/admin/conferences/#{conference.short_title}/contact/edit") expect(page).to have_link('Commercials', href: "/admin/conferences/#{conference.short_title}/commercials") - expect(page).to_not have_link('Splashpage', href: "/admin/conferences/#{conference.short_title}/splashpage") - expect(page).to_not have_link('Lodgings', href: "/admin/conferences/#{conference.short_title}/lodgings") - expect(page).to_not have_link('Registration Period', href: "/admin/conferences/#{conference.short_title}/registration_period") - expect(page).to_not have_text('Donations') - expect(page).to_not have_link('Sponsorship Levels', href: "/admin/conferences/#{conference.short_title}/sponsorship_levels") - expect(page).to_not have_link('Sponsors', href: "/admin/conferences/#{conference.short_title}/sponsors") - expect(page).to_not have_link('Tickets', href: "/admin/conferences/#{conference.short_title}/tickets") + expect(page).to have_no_link('Splashpage', href: "/admin/conferences/#{conference.short_title}/splashpage") + expect(page).to have_no_link('Lodgings', href: "/admin/conferences/#{conference.short_title}/lodgings") + expect(page).to have_no_link('Registration Period', href: "/admin/conferences/#{conference.short_title}/registration_period") + expect(page).to have_no_text('Donations') + expect(page).to have_no_link('Sponsorship Levels', href: "/admin/conferences/#{conference.short_title}/sponsorship_levels") + expect(page).to have_no_link('Sponsors', href: "/admin/conferences/#{conference.short_title}/sponsors") + expect(page).to have_no_link('Tickets', href: "/admin/conferences/#{conference.short_title}/tickets") expect(page).to have_link('Roles', href: "/admin/conferences/#{conference.short_title}/roles") expect(page).to have_link('Resources', href: "/admin/conferences/#{conference.short_title}/resources") expect(page).to have_selector('li.nav-header.nav-header-bigger a', text: 'Dashboard') - expect(page).to_not have_link('Venue', href: "/admin/conferences/#{conference.short_title}/venue") - expect(page).to_not have_link('Rooms', href: "/admin/conferences/#{conference.short_title}/venue/rooms") - expect(page).to_not have_link('Program', href: "/admin/conferences/#{conference.short_title}/program") - expect(page).to_not have_link('Call for Papers', href: "/admin/conferences/#{conference.short_title}/program/cfps") - expect(page).to_not have_link('Events', href: "/admin/conferences/#{conference.short_title}/program/events") - expect(page).to_not have_link('Tracks', href: "/admin/conferences/#{conference.short_title}/program/tracks") - expect(page).to_not have_link('Event Types', href: "/admin/conferences/#{conference.short_title}/program/event_types") - expect(page).to_not have_link('Difficulty Levels', href: "/admin/conferences/#{conference.short_title}/program/difficulty_levels") - expect(page).to_not have_link('Schedules', href: "/admin/conferences/#{conference.short_title}/schedules") - expect(page).to_not have_link('Reports', href: "/admin/conferences/#{conference.short_title}/program/reports") + expect(page).to have_no_link('Venue', href: "/admin/conferences/#{conference.short_title}/venue") + expect(page).to have_no_link('Rooms', href: "/admin/conferences/#{conference.short_title}/venue/rooms") + expect(page).to have_no_link('Program', href: "/admin/conferences/#{conference.short_title}/program") + expect(page).to have_no_link('Call for Papers', href: "/admin/conferences/#{conference.short_title}/program/cfps") + expect(page).to have_no_link('Events', href: "/admin/conferences/#{conference.short_title}/program/events") + expect(page).to have_no_link('Tracks', href: "/admin/conferences/#{conference.short_title}/program/tracks") + expect(page).to have_no_link('Event Types', href: "/admin/conferences/#{conference.short_title}/program/event_types") + expect(page).to have_no_link('Difficulty Levels', href: "/admin/conferences/#{conference.short_title}/program/difficulty_levels") + expect(page).to have_no_link('Schedules', href: "/admin/conferences/#{conference.short_title}/schedules") + expect(page).to have_no_link('Reports', href: "/admin/conferences/#{conference.short_title}/program/reports") expect(page).to have_link('Registrations', href: "/admin/conferences/#{conference.short_title}/registrations") expect(page).to have_link('Questions', href: "/admin/conferences/#{conference.short_title}/questions") - expect(page).to_not have_link('E-Mails', href: "/admin/conferences/#{conference.short_title}/emails") - expect(page).to_not have_link('New Conference', href: '/admin/conferences/new') + expect(page).to have_no_link('E-Mails', href: "/admin/conferences/#{conference.short_title}/emails") + expect(page).to have_no_link('New Conference', href: '/admin/conferences/new') visit edit_admin_conference_path(conference.short_title) expect(current_path).to eq(root_path) diff --git a/spec/features/organizer_ability_spec.rb b/spec/features/organizer_ability_spec.rb index 5547e799..74d15cc1 100644 --- a/spec/features/organizer_ability_spec.rb +++ b/spec/features/organizer_ability_spec.rb @@ -46,7 +46,7 @@ feature 'Has correct abilities' do expect(page).to have_link('E-Mails', href: "/admin/conferences/#{conference.short_title}/emails") expect(page).to have_link('Roles', href: "/admin/conferences/#{conference.short_title}/roles") expect(page).to have_link('Resources', href: "/admin/conferences/#{conference.short_title}/resources") - expect(page).to_not have_link('New Conference', href: '/admin/conferences/new') + expect(page).to have_no_link('New Conference', href: '/admin/conferences/new') visit admin_conference_path(other_conference.short_title) expect(page).to have_link('Add venue', href: "/admin/conferences/#{other_conference.short_title}/venue/new") diff --git a/spec/features/sponsor_spec.rb b/spec/features/sponsor_spec.rb index e64946ea..9366c11f 100644 --- a/spec/features/sponsor_spec.rb +++ b/spec/features/sponsor_spec.rb @@ -47,7 +47,7 @@ feature Sponsor do end page.find('#flash') expect(flash).to eq('Sponsor successfully deleted.') - expect(page).to_not have_selector('table#sponsors') + expect(page).to have_no_selector('table#sponsors') end end diff --git a/spec/features/track_organizer_ability_spec.rb b/spec/features/track_organizer_ability_spec.rb index 8ad930eb..6975135d 100644 --- a/spec/features/track_organizer_ability_spec.rb +++ b/spec/features/track_organizer_ability_spec.rb @@ -19,33 +19,33 @@ feature 'Has correct abilities' do expect(current_path).to eq(admin_conference_path(conference.short_title)) expect(page).to have_selector('li.nav-header.nav-header-bigger a', text: 'Dashboard') - expect(page).to_not have_link('Basics', href: "/admin/conferences/#{conference.short_title}/edit") + expect(page).to have_no_link('Basics', href: "/admin/conferences/#{conference.short_title}/edit") expect(page).to have_text('Basics') - expect(page).to_not have_link('Contact', href: "/admin/conferences/#{conference.short_title}/contact/edit") + expect(page).to have_no_link('Contact', href: "/admin/conferences/#{conference.short_title}/contact/edit") expect(page).to have_link('Commercials', href: "/admin/conferences/#{conference.short_title}/commercials") - expect(page).to_not have_link('Splashpage', href: "/admin/conferences/#{conference.short_title}/splashpage") - expect(page).to_not have_link('Venue', href: "/admin/conferences/#{conference.short_title}/venue") - expect(page).to_not have_link('Rooms', href: "/admin/conferences/#{conference.short_title}/venue/rooms") - expect(page).to_not have_link('Lodgings', href: "/admin/conferences/#{conference.short_title}/lodgings") + expect(page).to have_no_link('Splashpage', href: "/admin/conferences/#{conference.short_title}/splashpage") + expect(page).to have_no_link('Venue', href: "/admin/conferences/#{conference.short_title}/venue") + expect(page).to have_no_link('Rooms', href: "/admin/conferences/#{conference.short_title}/venue/rooms") + expect(page).to have_no_link('Lodgings', href: "/admin/conferences/#{conference.short_title}/lodgings") expect(page).to have_link('Program', href: "/admin/conferences/#{conference.short_title}/program") - expect(page).to_not have_link('Call for Papers', href: "/admin/conferences/#{conference.short_title}/program/cfps") + expect(page).to have_no_link('Call for Papers', href: "/admin/conferences/#{conference.short_title}/program/cfps") expect(page).to have_link('Events', href: "/admin/conferences/#{conference.short_title}/program/events") expect(page).to have_link('Tracks', href: "/admin/conferences/#{conference.short_title}/program/tracks") - expect(page).to_not have_link('Event Types', href: "/admin/conferences/#{conference.short_title}/program/event_types") - expect(page).to_not have_link('Difficulty Levels', href: "/admin/conferences/#{conference.short_title}/program/difficulty_levels") + expect(page).to have_no_link('Event Types', href: "/admin/conferences/#{conference.short_title}/program/event_types") + expect(page).to have_no_link('Difficulty Levels', href: "/admin/conferences/#{conference.short_title}/program/difficulty_levels") expect(page).to have_link('Schedules', href: "/admin/conferences/#{conference.short_title}/schedules") expect(page).to have_link('Reports', href: "/admin/conferences/#{conference.short_title}/program/reports") - expect(page).to_not have_link('Registrations', href: "/admin/conferences/#{conference.short_title}/registrations") - expect(page).to_not have_link('Registration Period', href: "/admin/conferences/#{conference.short_title}/registration_period") - expect(page).to_not have_link('Questions', href: "/admin/conferences/#{conference.short_title}/questions") - expect(page).to_not have_text('Donations') - expect(page).to_not have_link('Sponsorship Levels', href: "/admin/conferences/#{conference.short_title}/sponsorship_levels") - expect(page).to_not have_link('Sponsors', href: "/admin/conferences/#{conference.short_title}/sponsors") - expect(page).to_not have_link('Tickets', href: "/admin/conferences/#{conference.short_title}/tickets") - expect(page).to_not have_link('E-Mails', href: "/admin/conferences/#{conference.short_title}/emails") + expect(page).to have_no_link('Registrations', href: "/admin/conferences/#{conference.short_title}/registrations") + expect(page).to have_no_link('Registration Period', href: "/admin/conferences/#{conference.short_title}/registration_period") + expect(page).to have_no_link('Questions', href: "/admin/conferences/#{conference.short_title}/questions") + expect(page).to have_no_text('Donations') + expect(page).to have_no_link('Sponsorship Levels', href: "/admin/conferences/#{conference.short_title}/sponsorship_levels") + expect(page).to have_no_link('Sponsors', href: "/admin/conferences/#{conference.short_title}/sponsors") + expect(page).to have_no_link('Tickets', href: "/admin/conferences/#{conference.short_title}/tickets") + expect(page).to have_no_link('E-Mails', href: "/admin/conferences/#{conference.short_title}/emails") expect(page).to have_link('Roles', href: "/admin/conferences/#{conference.short_title}/roles") - expect(page).to_not have_link('Resources', href: "/admin/conferences/#{conference.short_title}/resources") - expect(page).to_not have_link('New Conference', href: '/admin/conferences/new') + expect(page).to have_no_link('Resources', href: "/admin/conferences/#{conference.short_title}/resources") + expect(page).to have_no_link('New Conference', href: '/admin/conferences/new') visit edit_admin_conference_path(conference.short_title) expect(current_path).to eq root_path