Testing tests

config/environments/development.rb

@@ -1,3 +1,5 @@
+#require 'perftools'
+
 BikeBike::Application.configure do
 	# Settings specified here will take precedence over those in config/application.rb.
 
@@ -42,4 +44,11 @@ BikeBike::Application.configure do
 	config.action_mailer.raise_delivery_errors = true
 	config.action_mailer.perform_deliveries = true
 	#config.action_mailer.default_charset = 'utf-8'
+
+    #Carmen.i18n_backend.locale_paths = ''
+    #puts "CARMEN\t" + Carmen.i18n_backend.locale_paths
+
+    #PerfTools::CpuProfiler.start('/tmp/dev_prof')
+    #config.serve_static_assets = true
+    #config.assets.precompile = false
 end

config/routes.rb

@@ -1,14 +1,12 @@
 BikeBike::Application.routes.draw do
 
-  resources :events
+	resources :events
 
-  resources :event_types
+	resources :event_types
 
-  resources :workshop_requested_resources
+	resources :workshop_requested_resources
 
-  resources :workshop_facilitators
-
-  resources :workshops
+	resources :workshop_facilitators
 
 	#resources :conference_registration_responses
 
@@ -25,7 +23,7 @@ BikeBike::Application.routes.draw do
 	resources :conferences, :param => 'slug' do
 		get :hosts
 		get :registration
-		get :workshops
+		resources :workshops, :param => 'slug'
 		get :registration
 		#resources :registrations, :path => 'registration' do
 		#	get :form, on: :collection