From 4b833840fd467b09b49a58637298d77671e3e80c Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 5 Aug 2025 16:50:35 +0200 Subject: [PATCH 1/2] Remove superflous PaperTrail::Version.where tests I think it's a bit overkill to test this line from Admin::VersionsController 30 times. ``` PaperTrail::Version.where(conference_id: @conference.id).accessible_by(current_ability) ``` Let's do it once... --- spec/features/versions_spec.rb | 381 +-------------------------------- 1 file changed, 1 insertion(+), 380 deletions(-) diff --git a/spec/features/versions_spec.rb b/spec/features/versions_spec.rb index 181598e5..9007e503 100644 --- a/spec/features/versions_spec.rb +++ b/spec/features/versions_spec.rb @@ -13,7 +13,7 @@ feature 'Version' do sign_in organizer end - scenario 'display changes in contact', feature: true, versioning: true, js: true do + scenario 'displays changes', feature: true, versioning: true, js: true do visit edit_admin_conference_contact_path(conference.short_title) fill_in 'contact_email', with: 'example@example.com' fill_in 'contact_sponsor_email', with: 'sponsor@example.com' @@ -24,383 +24,4 @@ feature 'Version' do visit admin_revision_history_path expect(page).to have_text("#{organizer.name} updated social tag, email, googleplus and sponsor email of contact details in conference #{conference.short_title}") end - - scenario 'display changes in program', feature: true, versioning: true, js: true do - visit edit_admin_conference_program_path(conference.short_title) - fill_in 'program_rating', with: '4' - click_button 'Update Program' - - visit admin_revision_history_path - expect(page).to have_text("#{organizer.name} updated rating of program in conference #{conference.short_title}") - end - - scenario 'display changes in cfp', feature: true, versioning: true, js: true do - cfp.update(start_date: (Time.zone.today + 1).strftime('%d/%m/%Y'), end_date: (Time.zone.today + 3).strftime('%d/%m/%Y')) - cfp_id = cfp.id - cfp.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) created new cfp for events with ID #{cfp_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated start date and end date of cfp for events with ID #{cfp_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted cfp for events with ID #{cfp_id} in conference #{conference.short_title}") - end - - scenario 'display changes in registration_period', feature: true, versioning: true, js: true do - registration_period = create(:registration_period, conference: conference) - registration_period.update(start_date: (Time.zone.today + 1).strftime('%d/%m/%Y'), end_date: (Time.zone.today + 3).strftime('%d/%m/%Y')) - registration_period_id = registration_period.id - registration_period.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) created new registration period with ID #{registration_period_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated start date and end date of registration period with ID #{registration_period_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted registration period with ID #{registration_period_id} in conference #{conference.short_title}") - end - - scenario 'display changes in conference', feature: true, versioning: true, js: true do - new_conference = create(:conference, title: 'Test Conference') - organizer.add_role :organizer, new_conference - new_conference.update(title: 'New Con', short_title: 'NewCon') - - visit admin_revision_history_path - select '100', from: 'versionstable_length' - expect(page).to have_text('Someone (probably via the console) created new conference NewCon') - expect(page).to have_text('Someone (probably via the console) created new event type Talk in conference NewCon') - expect(page).to have_text('Someone (probably via the console) created new event type Workshop in conference NewCon') - expect(page).to have_text('Someone (probably via the console) updated title and short title of conference NewCon') - end - - scenario 'display changes in event_type', feature: true, versioning: true, js: true do - event_type = create(:event_type, program: conference.program, name: 'Discussion') - event_type.update(length: 90, maximum_abstract_length: 10000) - event_type_id = event_type.id - event_type.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) created new event type Discussion with ID #{event_type_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated length and maximum abstract length of event type Discussion with ID #{event_type_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted event type Discussion with ID #{event_type_id} in conference #{conference.short_title}") - end - - scenario 'display changes in lodging', feature: true, versioning: true, js: true do - lodging = create(:lodging, conference: conference, name: 'Hotel XYZ') - lodging.update(description: 'Nice view,close to venue', website_link: 'http://www.example.com') - lodging_id = lodging.id - lodging.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) created new lodging Hotel XYZ with ID #{lodging_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated description and website link of lodging Hotel XYZ with ID #{lodging_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted lodging Hotel XYZ with ID #{lodging_id} in conference #{conference.short_title}") - end - - scenario 'display changes in conference role', feature: true, versioning: true, js: true do - visit edit_admin_conference_role_path(conference.short_title, 'cfp') - fill_in 'role_description', with: 'For the members of the call for papers team' - click_button 'Update Role' - - visit admin_revision_history_path(conference_id: conference.short_title) - expect(page).to have_text("#{organizer.name} updated description of role cfp in conference #{conference.short_title}") - end - - scenario 'display changes in room', feature: true, versioning: true, js: true do - venue = create(:venue, conference: conference) - room = create(:room, venue: venue, name: 'Auditorium') - room.update_attribute(:size, 120) - room_id = room.id - room.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) created new room Auditorium with ID #{room_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated size of room Auditorium with ID #{room_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted room Auditorium with ID #{room_id} in conference #{conference.short_title}") - end - - scenario 'display changes in sponsor', feature: true, versioning: true, js: true do - conference.sponsorship_levels << create_list(:sponsorship_level, 2, conference: conference) - sponsor = create(:sponsor, conference: conference, name: 'SUSE', sponsorship_level: conference.sponsorship_levels.first) - sponsor.update(website_url: 'https://www.suse.com/company/history', sponsorship_level: conference.sponsorship_levels.second) - sponsor.destroy - sponsor_id = sponsor.id - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) created new sponsor SUSE with ID #{sponsor_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated website url and sponsorship level of sponsor SUSE with ID #{sponsor_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted sponsor SUSE with ID #{sponsor_id} in conference #{conference.short_title}") - end - - scenario 'display changes in sponsorship_level', feature: true, versioning: true, js: true do - sponsorship_level = create(:sponsorship_level, conference: conference) - sponsorship_level.update_attribute(:title, 'Gold') - sponsorship_level_id = sponsorship_level.id - sponsorship_level.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) created new sponsorship level Gold with ID #{sponsorship_level_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated title of sponsorship level Gold with ID #{sponsorship_level_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted sponsorship level Gold with ID #{sponsorship_level_id} in conference #{conference.short_title}") - end - - scenario 'display changes in ticket', feature: true, versioning: true, js: true do - ticket = create(:ticket, conference: conference, title: 'Gold') - ticket.update(price: 50, description: 'Premium Ticket') - ticket_id = ticket.id - ticket.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) created new ticket Gold with ID #{ticket_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated description and price cents of ticket Gold with ID #{ticket_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted ticket Gold with ID #{ticket_id} in conference #{conference.short_title}") - end - - scenario 'display changes in track', feature: true, versioning: true, js: true do - track = create(:track, program: conference.program, name: 'Distribution') - track.update_attribute(:description, 'Events about Linux distributions') - track_id = track.id - track.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) created new track Distribution with ID #{track_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated description of track Distribution with ID #{track_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted track Distribution with ID #{track_id} in conference #{conference.short_title}") - end - - scenario 'display changes in venue', feature: true, versioning: true, js: true do - venue = create(:venue, conference: conference, name: 'Example University') - venue.update(website: 'www.example.com new', description: 'Just another beautiful venue') - venue_id = venue.id - venue.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) created new venue Example University with ID #{venue_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated website and description of venue Example University with ID #{venue_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted venue Example University with ID #{venue_id} in conference #{conference.short_title}") - end - - scenario 'display changes in event', feature: true, versioning: true, js: true do - visit new_conference_program_proposal_path(conference_id: conference.short_title) - fill_in 'event_title', with: 'ABC' - fill_in 'event_abstract', with: 'Lorem ipsum abstract' - select('Talk - 30 min', from: 'event[event_type_id]') - click_button 'Create Proposal' - - click_link 'Edit' - fill_in 'event_subtitle', with: 'My event subtitle' - select('Easy', from: 'event[difficulty_level_id]') - click_button 'Update Proposal' - - visit admin_conference_program_events_path(conference.short_title) - click_on 'New' - click_link 'Reject' - - visit conference_program_proposals_path(conference_id: conference.short_title) - within('#events') do - click_link 'Re-Submit' - end - - visit admin_conference_program_events_path(conference.short_title) - click_on 'New' - click_link 'Accept' - - visit conference_program_proposals_path(conference_id: conference.short_title) - click_link 'Confirm' - - visit admin_conference_program_events_path(conference.short_title) - click_on 'Confirmed' - click_link 'Cancel' - - visit admin_revision_history_path - expect(page).to have_text("#{organizer.name} submitted new event ABC in conference #{conference.short_title}") - expect(page).to have_text("#{organizer.name} updated subtitle and difficulty level of event ABC in conference #{conference.short_title}") - expect(page).to have_text("#{organizer.name} rejected event ABC in conference #{conference.short_title}") - expect(page).to have_text("#{organizer.name} resubmitted event ABC in conference #{conference.short_title}") - expect(page).to have_text("#{organizer.name} accepted event ABC in conference #{conference.short_title}") - expect(page).to have_text("#{organizer.name} confirmed event ABC in conference #{conference.short_title}") - expect(page).to have_text("#{organizer.name} canceled event ABC in conference #{conference.short_title}") - end - - scenario 'display changes in difficulty levels', feature: true, versioning: true, js: true do - difficulty_level = create(:difficulty_level, program: conference.program, title: 'Expert') - difficulty_level.update_attribute(:description, 'Only for Experts') - difficulty_level_id = difficulty_level.id - difficulty_level.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) created new difficulty level Expert with ID #{difficulty_level_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated description of difficulty level Expert with ID #{difficulty_level_id} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted difficulty level Expert with ID #{difficulty_level_id} in conference #{conference.short_title}") - end - - scenario 'display changes in splashpages', feature: true, versioning: true, js: true do - visit admin_conference_splashpage_path(conference.short_title) - click_link 'Create Splashpage' - click_button 'Save' - - click_link 'Configure' - check('Display the program?') - check('Display call for papers and call for tracks?') - check('Display the venue?') - check('Display the tickets?') - check('Display the lodgings?') - check('Display the sponsors?') - check('Display the social media links?') - check('Make splash page public?') - click_button 'Save' - splashpage_id = conference.splashpage.id - - click_link 'Delete' - page.accept_alert - expect(page).to have_text('Splashpage was successfully destroyed') - - visit admin_revision_history_path - expect(page).to have_text("#{organizer.name} created new splashpage with ID #{splashpage_id} in conference #{conference.short_title}") - expect(page).to have_text("#{organizer.name} updated public, include program, include social media, include venue, include tickets, include sponsors, include lodgings and include cfp of splashpage with ID #{splashpage_id} in conference #{conference.short_title}") - expect(page).to have_text("#{organizer.name} deleted splashpage with ID #{splashpage_id} in conference #{conference.short_title}") - end - - scenario 'displays users subscribe/unsubscribe to conferences', feature: true, versioning: true, js: true do - visit root_path - click_link 'Subscribe' - click_link 'Unsubscribe' - PaperTrail::Version.last.reify.save! - PaperTrail::Version.last.item.destroy! - - visit admin_revision_history_path - expect(page).to have_text("#{organizer.name} subscribed to conference #{conference.short_title}") - expect(page).to have_text("#{organizer.name} unsubscribed from conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) subscribed #{organizer.name} to conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) unsubscribed #{organizer.name} from conference #{conference.short_title}") - end - - scenario 'display changes in conference commercials', feature: true, versioning: true, js: true do - conference_commercial = create(:conference_commercial, commercialable: conference) - conference_commercial.update_attribute(:url, 'https://www.youtube.com/watch?v=VNkDJk5_9eU') - conference_commercial.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) created new commercial in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated url of commercial in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted commercial in conference #{conference.short_title}") - end - - scenario 'display changes in event commercials', feature: true, versioning: true, js: true do - event_commercial - event_commercial.update_attribute(:url, 'https://www.youtube.com/watch?v=VNkDJk5_9eU') - event_commercial.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) created new commercial in event #{event_with_commercial.title} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated url of commercial in event #{event_with_commercial.title} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted commercial in event #{event_with_commercial.title} in conference #{conference.short_title}") - end - - scenario 'display changes in event commercials in event history', feature: true, versioning: true, js: true do - event_without_commercial = create(:event, program: conference.program) - event_commercial - - visit admin_conference_program_event_path(conference.short_title, event_with_commercial) - click_link 'History' - expect(page).to have_text('Someone (probably via the console) created new commercial') - visit admin_conference_program_event_path(conference.short_title, event_without_commercial) - click_link 'History' - expect(page).to have_no_text('Someone (probably via the console) created new commercial') - end - - scenario 'display changes in users_role for conference role', feature: true, versioning: true, js: true do - user = create(:user) - role = Role.find_by(name: 'cfp', resource_id: conference.id, resource_type: 'Conference') - user.add_role :cfp, conference - user_role = UsersRole.find_by(user_id: user.id, role_id: role.id) - user.remove_role :cfp, conference - - visit admin_revision_history_path - expect(page).to have_text("added role cfp with ID #{user_role.id} to user #{user.name} in conference #{conference.short_title}") - expect(page).to have_text("removed role cfp with ID #{user_role.id} from user #{user.name} in conference #{conference.short_title}") - end - - scenario 'display changes in email settings', feature: true, versioning: true, js: true do - conference.email_settings.update(registration_subject: 'xxxxx', registration_body: 'yyyyy', accepted_subject: 'zzzzz') - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) updated registration body, registration subject and accepted subject of email settings in conference #{conference.short_title}") - end - - scenario 'display changes in conference registrations', feature: true, versioning: true, js: true do - Registration.create(user: organizer, conference: conference) - Registration.last.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) registered #{organizer.name} to conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) unregistered #{organizer.name} from conference #{conference.short_title}") - end - - scenario 'display changes in event registration', feature: true, versioning: true, js: true do - create(:event, program: conference.program, title: 'My first event') - registration = Registration.create(user: organizer, conference: conference) - event = create(:event, program: conference.program, title: 'My second event') - EventsRegistration.create(registration: registration, event: event) - EventsRegistration.first.update_attribute(:attended, true) - EventsRegistration.last.destroy - # Here registration is deleted to ensure the event registration related change still displays the associated user's name - registration.destroy - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) registered #{organizer.name} to event My second event in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) updated attended of #{organizer.name}'s registration for event #{event.title} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) unregistered #{organizer.name} from event #{event.title} in conference #{conference.short_title}") - end - - scenario 'display changes in comment', feature: true, versioning: true, js: true do - create(:event, program: conference.program, title: 'My first event') - event = create(:event, program: conference.program, title: 'My second event') - visit admin_conference_program_event_path(conference_id: conference.short_title, id: event.id) - click_link 'Show' - fill_in 'comment_body', with: 'Sample comment' - click_button 'Save Comment' - expect(page).to have_text('Comments (1)') - Comment.last.destroy - PaperTrail::Version.last.reify.save - - visit admin_revision_history_path - expect(page).to have_text("#{organizer.name} commented on event My second event in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted #{organizer.name}'s comment on event #{event.title} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) re-added #{organizer.name}'s comment on event #{event.title} in conference #{conference.short_title}") - end - - scenario 'display changes in vote', feature: true, versioning: true, js: true do - conference.program.rating = 1 - create(:event, program: conference.program, title: 'My first event') - event = create(:event, program: conference.program, title: 'My second event') - create(:vote, user: organizer, event: event) - Vote.last.destroy - PaperTrail::Version.last.reify.save - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) voted on event My second event in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) deleted #{organizer.name}'s vote on event #{event.title} in conference #{conference.short_title}") - expect(page).to have_text("Someone (probably via the console) re-added #{organizer.name}'s vote on event #{event.title} in conference #{conference.short_title}") - end - - scenario 'display password reset requests', feature: true, versioning: true, js: true do - user = create(:user) - user.send_reset_password_instructions - - visit admin_revision_history_path - expect(page).to have_text("Someone requested password reset of user #{user.name}") - end - - scenario 'display user signups', feature: true, versioning: true, js: true do - create(:user, name: 'testname') - - visit admin_revision_history_path - expect(page).to have_text('testname signed up') - end - - scenario 'display updates to user', feature: true, versioning: true, js: true do - user = create(:user) - user.update(nickname: 'testnick', affiliation: 'openSUSE') - - visit admin_revision_history_path - expect(page).to have_text("Someone (probably via the console) updated nickname and affiliation of user #{user.name}") - end end From eb16282a015708231871291253f2bf7ae0549b70 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 5 Aug 2025 17:50:55 +0200 Subject: [PATCH 2/2] Make spec thread safe... Something(???) has changed that Github Actions has become *so* fast that those hit now... --- spec/features/conference_registration_spec.rb | 7 +++---- spec/features/roles_spec.rb | 2 ++ spec/features/tickets_spec.rb | 6 ++---- spec/features/versions_spec.rb | 2 ++ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/spec/features/conference_registration_spec.rb b/spec/features/conference_registration_spec.rb index 4a9df4d8..3e7ba537 100644 --- a/spec/features/conference_registration_spec.rb +++ b/spec/features/conference_registration_spec.rb @@ -46,11 +46,10 @@ feature Registration do context 'who is not registered' do scenario 'registers for a conference', feature: true, js: true do - visit root_path - click_link 'Register' - - expect(current_path).to eq(new_conference_conference_registration_path(conference.short_title)) + visit new_conference_conference_registration_path(conference.short_title) click_button 'Register' + page.find('#flash') + expect(flash).to eq('You are now registered and will be receiving E-Mail notifications.') expect(conference.user_registered?(participant)).to be(true) end diff --git a/spec/features/roles_spec.rb b/spec/features/roles_spec.rb index 3bc34196..83377a19 100644 --- a/spec/features/roles_spec.rb +++ b/spec/features/roles_spec.rb @@ -58,6 +58,8 @@ feature Role do fill_in 'user_email', with: user_with_no_role.email click_button 'Add' + page.find('.alert') + user_with_no_role.reload expect(user_with_no_role.has_cached_role?(role.name, conference)).to be true diff --git a/spec/features/tickets_spec.rb b/spec/features/tickets_spec.rb index 047a4e38..cb881400 100644 --- a/spec/features/tickets_spec.rb +++ b/spec/features/tickets_spec.rb @@ -41,12 +41,10 @@ feature Ticket do click_button 'Update Ticket' - ticket.reload - # It's necessary to multiply by 100 because the price is in cents page.find('#flash') expect(flash).to eq('Ticket successfully updated.') - expect(ticket.price).to eq(Money.new(50 * 100, 'USD')) - expect(ticket.title).to eq('Event Ticket') + expect(ticket.reload.price.to_i).to eq(50) + expect(ticket.reload.title).to eq('Event Ticket') expect(Ticket.count).to eq(2) end diff --git a/spec/features/versions_spec.rb b/spec/features/versions_spec.rb index 9007e503..6ed5ea18 100644 --- a/spec/features/versions_spec.rb +++ b/spec/features/versions_spec.rb @@ -20,6 +20,8 @@ feature 'Version' do fill_in 'contact_social_tag', with: 'example' fill_in 'contact_googleplus', with: 'http:\\www.google.com' click_button 'Update Contact' + page.find('#flash') + expect(flash).to eq('Contact details were successfully updated.') visit admin_revision_history_path expect(page).to have_text("#{organizer.name} updated social tag, email, googleplus and sponsor email of contact details in conference #{conference.short_title}")