update

config/environments/test.rb

@@ -46,6 +46,7 @@ Osem::Application.configure do
     # Set Time.now to May 1, 2014 00:01:00 AM (at this instant), but allow it to move forward
     t = Time.local(2014, 05, 01, 00, 01, 00)
     Timecop.travel(t)
+    ActiveSupport::Deprecation.silenced = true
   end
 
 end

config/routes.rb

@@ -44,15 +44,31 @@ Osem::Application.routes.draw do
 
       # Singletons
       resource :splashpage
-      resource :call_for_paper
-      resource :venue
+      resource :venue do
+        resources :rooms, except: [:show]
+      end
       resource :registration_period
+      resource :program do
+        resource :cfp
+        resources :tracks
+        resources :event_types
+        resources :difficulty_levels
+        resources :events do
+          member do
+            post :comment
+            patch :accept
+            patch :confirm
+            patch :cancel
+            patch :reject
+            patch :unconfirm
+            patch :restart
+            get :vote
+          end
+          resource :speaker, only: [:edit, :update]
+        end
+      end
 
       resources :tickets
-      resources :tracks
-      resources :event_types
-      resources :difficulty_levels
-      resources :rooms, except: [:show]
       resources :sponsors, except: [:show]
       resources :lodgings, except: [:show]
       resources :targets, except: [:show]
@@ -71,31 +87,19 @@ Osem::Application.routes.draw do
           patch :update_conference
         end
       end
-
-      resources :events do
-        member do
-          post :comment
-          patch :accept
-          patch :confirm
-          patch :cancel
-          patch :reject
-          patch :unconfirm
-          patch :restart
-          get :vote
-        end
-        resource :speaker, only: [:edit, :update]
-      end
     end
   end
 
   resources :conference, only: [:index, :show] do
-    resources :proposal do
-      get 'commercials/render_commercial' => 'commercials#render_commercial'
-      resources :commercials, only: [:create, :update, :destroy]
-      resources :event_attachment, controller: 'event_attachments'
-      member do
-        patch '/confirm' => 'proposal#confirm'
-        patch '/restart' => 'proposal#restart'
+    resource :program, except: :destroy do
+      resources :proposal do
+        get 'commercials/render_commercial' => 'commercials#render_commercial'
+        resources :commercials, only: [:create, :update, :destroy]
+        resources :event_attachment, controller: 'event_attachments'
+        member do
+          patch '/confirm' => 'proposal#confirm'
+          patch '/restart' => 'proposal#restart'
+        end
       end
     end
 
@@ -111,8 +115,7 @@ Osem::Application.routes.draw do
 
   namespace :api, defaults: {format: 'json'} do
     namespace :v1 do
-      resources :conferences, only: :index do
-        resources :conferences, only: :index
+      resources :conferences, only: [ :index, :show ] do
         resources :rooms, only: :index
         resources :tracks, only: :index
         resources :speakers, only: :index