Merge pull request #247 from gopesht/add_splash_dashboard

Adds Splash Checkbox in Conference Settings

spec/controllers/conference_controller_spec.rb

@@ -3,14 +3,24 @@ require 'spec_helper'
 describe ConferenceController do
   let(:conference) { create(:conference) }
   describe 'GET #show' do
-    it 'assigns the requested conference to conference' do
-      get :show, id: conference.short_title
-      expect(assigns(:conference)).to eq conference
-    end
+    context 'conference made public' 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 show template' do
-      get :show, id: conference.short_title
-      expect(response).to render_template :show
+      it 'renders the show template' do
+        get :show, id: conference.short_title
+        expect(response).to render_template :show
+      end
+    end
+    context 'conference is not public' do
+      it 'raises routing error' do
+        # rendered as 404 NOT FOUND in production environment
+        conference.update_attribute(:make_conference_public, false)
+        expect { get :show, id: conference.short_title }.
+            to raise_error(ActionController::RoutingError)
+      end
     end
   end
 end

spec/factories/conferences.rb

@@ -9,6 +9,7 @@ FactoryGirl.define do
     contact_email 'admin@example.com'
     start_date Date.today
     end_date Date.tomorrow
+    make_conference_public true
     venue
   end
 end

spec/models/conference_spec.rb

@@ -594,6 +594,7 @@ describe Conference do
       @result['tracks'] = true
       @result['event_types'] = true
       @result['difficulty_levels'] = true
+      @result['make_conference_public'] = true
 
       # Setup negative result hash
       @result_false = Hash.new
@@ -613,6 +614,7 @@ describe Conference do
       subject.tracks = []
       subject.event_types = []
       subject.difficulty_levels = []
+      subject.make_conference_public = false
 
       expect(subject.get_status).to eq(@result_false)
     end
@@ -625,9 +627,10 @@ describe Conference do
       subject.tracks = []
       subject.event_types = []
       subject.difficulty_levels = []
+      subject.make_conference_public = false
 
       @result_false['registration'] = true
-      @result_false['process'] = 14.to_s
+      @result_false['process'] = 13.to_s
 
       expect(subject.get_status).to eq(@result_false)
     end
@@ -640,10 +643,11 @@ describe Conference do
       subject.tracks = []
       subject.event_types = []
       subject.difficulty_levels = []
+      subject.make_conference_public = false
 
       @result_false['cfp'] = true
       @result_false['registration'] = true
-      @result_false['process'] = 29.to_s
+      @result_false['process'] = 25.to_s
 
       expect(subject.get_status).to eq(@result_false)
     end
@@ -657,11 +661,12 @@ describe Conference do
       subject.tracks = []
       subject.event_types = []
       subject.difficulty_levels = []
+      subject.make_conference_public = false
 
       @result_false['cfp'] = true
       @result_false['registration'] = true
       @result_false['venue'] = true
-      @result_false['process'] = 43.to_s
+      @result_false['process'] = 38.to_s
 
       expect(subject.get_status).to eq(@result_false)
     end
@@ -675,12 +680,13 @@ describe Conference do
       subject.tracks = []
       subject.event_types = []
       subject.difficulty_levels = []
+      subject.make_conference_public = false
 
       @result_false['cfp'] = true
       @result_false['registration'] = true
       @result_false['venue'] = true
       @result_false['rooms'] = true
-      @result_false['process'] = 57.to_s
+      @result_false['process'] = 50.to_s
 
       expect(subject.get_status).to eq(@result_false)
     end
@@ -694,13 +700,14 @@ describe Conference do
       subject.venue = create(:venue)
       subject.event_types = []
       subject.difficulty_levels = []
+      subject.make_conference_public = false
 
       @result_false['cfp'] = true
       @result_false['registration'] = true
       @result_false['venue'] = true
       @result_false['rooms'] = true
       @result_false['tracks'] = true
-      @result_false['process'] = 71.to_s
+      @result_false['process'] = 63.to_s
 
       expect(subject.get_status).to eq(@result_false)
     end
@@ -715,6 +722,7 @@ describe Conference do
       subject.call_for_papers = create(:call_for_papers)
       subject.venue = create(:venue)
       subject.difficulty_levels = []
+      subject.make_conference_public = false
 
       @result_false['cfp'] = true
       @result_false['registration'] = true
@@ -722,7 +730,7 @@ describe Conference do
       @result_false['rooms'] = true
       @result_false['tracks'] = true
       @result_false['event_types'] = true
-      @result_false['process'] = 86.to_s
+      @result_false['process'] = 75.to_s
 
       expect(subject.get_status).to eq(@result_false)
     end
@@ -737,6 +745,7 @@ describe Conference do
       subject.venue = create(:venue)
       subject.call_for_papers = create(:call_for_papers)
       subject.venue = create(:venue)
+      subject.make_conference_public = true
 
       expect(subject.get_status).to eq(@result)
     end