Merge OSEM updates

spec/controllers/admin/cfps_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'pry'
-
 # frozen_string_literal: true
 
 require 'spec_helper'

spec/controllers/admin/users_controller_spec.rb

@@ -8,10 +8,10 @@ describe Admin::UsersController do
     sign_in(admin)
   end
   describe 'GET #index' do
-    it 'sets up users array with existing users records' do
+    xit 'sets up users array with existing users records' do
       user1 = create(:user, email: 'user1@email.osem')
       user2 = create(:user, email: 'user2@email.osem')
-      user_deleted = User.find_by(name: 'User deleted')
+      user_deleted = User.find_by!(username: 'deleted_user')
       get :index
       expect(assigns(:users)).to match_array([user_deleted, user, admin, user1, user2])
     end

spec/datatables/user_datatable_spec.rb

@@ -95,18 +95,22 @@ describe UserDatatable do
     let(:output) { subject.as_json }
 
     it 'recordsTotal' do
+      pending('This fails since Ruby 2.5.8')
       expect(output[:recordsTotal]).to eq(1)
     end
 
     it 'recordsFiltered' do
+      pending('This fails since Ruby 2.5.8')
       expect(output[:recordsFiltered]).to eq(1)
     end
 
     it 'data length' do
+      pending('This fails since Ruby 2.5.8')
       expect(output[:data].length).to eq(1)
     end
 
     it 'has expected data columns' do
+      pending('This fails since Ruby 2.5.8')
       expect(output[:data].first.keys).to eq(data_cols)
     end
 
@@ -114,27 +118,32 @@ describe UserDatatable do
       let(:user_data) { output[:data].first }
 
       it 'id' do
+        pending('This fails since Ruby 2.5.8')
         expect(user_data[:id].to_i).to eq(user.id)
       end
 
       it 'name' do
+        pending('This fails since Ruby 2.5.8')
         expect(user_data[:name]).to eq(user.name)
       end
 
       it 'email' do
+        pending('This fails since Ruby 2.5.8')
         expect(user_data[:email]).to eq(user.email)
       end
 
       it 'confirmed_at' do
-
+        pending('This fails since Ruby 2.5.8')
         expect(Date.parse(user_data[:confirmed_at])).to eq(user.confirmed_at.to_date)
       end
 
       it 'attended' do
+        pending('This fails since Ruby 2.5.8')
         expect(user_data[:attended].to_i).to eq(user.attended_count)
       end
 
       it 'roles' do
+        pending('This fails since Ruby 2.5.8')
         expect(user_data[:roles]).to eq('None')
       end
     end

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

spec/models/conference_spec.rb

@@ -39,6 +39,34 @@
 # !/bin/env ruby
 require 'spec_helper'
 
+context 'Delegation' do
+  subject do
+    FactoryBot.create(:conference, start_date: 1.month.from_now, end_date: 2.month.from_now)
+  end
+
+  context 'Venue' do
+    context 'when venue has not been set' do
+      it 'the accessors should be nil' do
+        expect(subject.city).to eq(nil)
+        expect(subject.country_name).to eq(nil)
+        expect(subject.venue_name).to eq(nil)
+        expect(subject.venue_street).to eq(nil)
+      end
+    end
+
+    context 'when venue has been set' do
+      it 'should delegate to venue' do
+        venue = FactoryBot.create(:venue)
+        subject.update(venue: venue)
+        expect(subject.city).to eq(venue.city)
+        expect(subject.country_name).to eq(venue.country_name)
+        expect(subject.venue_name).to eq(venue.name)
+        expect(subject.venue_street).to eq(venue.street)
+      end
+    end
+  end
+end
+
 describe Conference do
 
   let(:subject) { create(:conference, start_date: Date.new(2014, 06, 30), end_date: Date.new(2014, 06, 30)) }

spec/models/user_spec.rb

@@ -480,7 +480,7 @@ describe User do
   end
 
   describe 'assigns admin attribute' do
-    it 'to second user when first user is deleted_user' do
+    xit 'to second user when first user is deleted_user' do
       deleted_user = User.find_by(email: 'deleted@localhost.osem')
       expect(deleted_user.is_admin).to be false
 

spec/spec_helper.rb

@@ -3,9 +3,9 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 require 'simplecov'
 
-if ENV['TRAVIS']
-  require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+if ENV['GITHUB_ACTIONS']
+  require 'simplecov-cobertura'
+  SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 end
 SimpleCov.start 'rails'