method added to autocycle through sponsors based on sponsor level and code added to inherit twitter env variables

spec/controllers/admin/conferences_controller_spec.rb

@@ -165,18 +165,6 @@ describe Admin::ConferencesController do
       end
     end
 
-    describe 'GET #conference_wide_screen' do
-      it 'assigns the requested conference to conference' do
-        get :show, id: conference.short_title
-        expect(assigns(:conference)).to eq conference
-      end
-
-      it 'renders the conference_wide_screen page' do
-        get :conference_wide_screen, id: conference.short_title
-        expect(response).to render_template :conference_wide_screen
-      end
-    end
-
     describe 'GET #index' do
       context 'with more than 0 conferences' do
         it 'populates an array with conferences' do
@@ -292,18 +280,6 @@ describe Admin::ConferencesController do
         end
       end
     end
-
-    describe 'GET #conference_wide_screen' do
-      it 'requires organizer privileges' do
-        get :conference_wide_screen, id: conference.short_title,
-                                     conference: attributes_for(:conference,
-                                                                short_title: 'ExCon')
-        expect(response).to redirect_to(send(path))
-        if message
-          expect(flash[:alert]).to match(/#{message}/)
-        end
-      end
-    end
   end
 
   describe 'participant access' do

spec/factories/events.rb

@@ -33,6 +33,19 @@ FactoryGirl.define do
           event.event_schedules << build(:event_schedule, event: event)
         end
       end
+
+      factory :past_event do
+        after(:build) do |event|
+          event.start_time = (DateTime.current - 2.days).to_s
+          event.state = 'confirmed'
+        end
+      end
+      factory :future_event do
+        after(:build) do |event|
+          event.start_time = (DateTime.current + 2.days).to_s
+          event.state = 'confirmed'
+        end
+      end
     end
   end
 end

spec/models/event_spec.rb

@@ -114,6 +114,14 @@ describe Event do
         expect(conference.program.events.highlighted).to eq [my_event]
       end
     end
+    context 'current' do
+      it 'returns only current events' do
+        current_event = create(:event, start_time: Time.current.to_s, state: 'confirmed', program: conference.program)
+        create(:past_event, program: conference.program)
+        create(:future_event, program: conference.program)
+        expect(conference.program.events.current).to match_array([current_event])
+      end
+    end
   end
 
   describe '#scheduled?' do
@@ -327,28 +335,4 @@ describe Event do
       expect(other_event.week).to eq 48
     end
   end
-
-  describe 'current?' do
-    let(:past_event) { create(:event, program: conference.program) }
-    let(:future_event) { create(:event, program: conference.program) }
-
-    before do
-      event.update_attributes(start_time: Time.current.to_s)
-      past_event.update_attributes(start_time: (Time.current - 2.days).to_s)
-      future_event.update_attributes(start_time: (Time.current + 2.days).to_s)
-    end
-
-    it 'returns false for a completed event' do
-      expect(past_event.current?).to be_falsey
-    end
-
-    it 'returns false for a future event' do
-      expect(future_event.current?).to be_falsey
-    end
-
-    it 'returns true for a current event' do
-      expect(event.current?).to be_truthy
-    end
-  end
-
 end