Merge OSEM updates

spec/features/base_controller_spec.rb

@@ -34,31 +34,31 @@ feature 'BaseController' do
         expect(flash).to eq 'You are not authorized to access this page.'
       end
 
-      it 'an admin he can access the admin area' do
+      it 'an admin they can access the admin area' do
         user.is_admin = true
         visit admin_conferences_path
         expect(current_path).to eq admin_conferences_path
       end
 
-      it 'an organizer he can access the admin area' do
+      it 'an organizer they can access the admin area' do
         user.role_ids = organizer_role.id
         visit admin_conferences_path
         expect(current_path).to eq admin_conferences_path
       end
 
-      it 'a volunteers_coordinator he can access the admin area' do
+      it 'a volunteers_coordinator they can access the admin area' do
         user.role_ids = volunteers_coordinator_role.id
         visit admin_conferences_path
         expect(current_path).to eq admin_conferences_path
       end
 
-      it 'a cfp he can access the admin area' do
+      it 'a cfp they can access the admin area' do
         user.role_ids = cfp_role.id
         visit admin_conferences_path
         expect(current_path).to eq admin_conferences_path
       end
 
-      it 'an info_desk he can access the admin area' do
+      it 'an info_desk they can access the admin area' do
         user.role_ids = info_desk_role.id
         visit admin_conferences_path
         expect(current_path).to eq admin_conferences_path

spec/features/proposals_spec.rb

@@ -107,6 +107,17 @@ feature Event do
       expect(User.count).to eq(expected_count_user)
     end
 
+    scenario 'edit proposal without cfp' do
+      conference = create(:conference)
+      proposal = create(:event, program: conference.program)
+
+      sign_in proposal.submitter
+
+      visit edit_conference_program_proposal_path(proposal.program.conference.short_title, proposal)
+
+      expect(page).to have_content 'Proposal Information'
+    end
+
     scenario 'update a proposal' do
       conference = create(:conference)
       create(:cfp, program: conference.program)

spec/features/versions_spec.rb

@@ -232,7 +232,7 @@ feature 'Version' do
   end
 
   # TODO-SNAPCON: Figure out why this is failing!!
-  skip 'display changes in splashpages', feature: true, versioning: true, js: true do
+  xscenario '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 Changes'
@@ -247,15 +247,15 @@ feature 'Version' do
     uncheck('Display social media links')
     check('Make splash page public?')
     click_button 'Save Changes'
-    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 cfp, include venue, include tickets, include lodgings, include sponsors and include social media 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}")
+    expect(page).to have_text("#{organizer.name} created new splashpage in conference #{conference.short_title}")
+    expect(page).to have_text("#{organizer.name} updated public, include program, include cfp, include venue, include tickets, include lodgings, include sponsors and include social media of splashpage in conference #{conference.short_title}")
+    expect(page).to have_text("#{organizer.name} deleted splashpage in conference #{conference.short_title}")
   end
 
   scenario 'displays users subscribe/unsubscribe to conferences', feature: true, versioning: true, js: true do