From 717ded7f5e5ff50dd089d6eda919cbac329303f2 Mon Sep 17 00:00:00 2001 From: Mark Cottman-Fields Date: Mon, 21 Jan 2013 14:35:33 +1000 Subject: [PATCH] Added tests for show action in controller specs. Added tests for home controller. Added seeds for permissions and progress. Added ability to select a random item from all those available, for using in a test. More information is printed by the audio tests when they fail. modified: Gemfile modified: Gemfile.lock modified: app/controllers/home_controller.rb modified: app/models/permission.rb modified: db/development_seeds.rb modified: spec/controllers/analysis_items_controller_spec.rb modified: spec/controllers/analysis_jobs_controller_spec.rb modified: spec/controllers/analysis_scripts_controller_spec.rb modified: spec/controllers/audio_events_controller_spec.rb modified: spec/controllers/audio_recordings_controller_spec.rb modified: spec/controllers/bookmarks_controller_spec.rb modified: spec/controllers/home_controller_spec.rb modified: spec/controllers/permissions_controller_spec.rb modified: spec/controllers/photos_controller_spec.rb modified: spec/controllers/progresses_controller_spec.rb modified: spec/controllers/projects_controller_spec.rb modified: spec/controllers/saved_searches_controller_spec.rb modified: spec/controllers/sites_controller_spec.rb modified: spec/controllers/tags_controller_spec.rb modified: spec/controllers/users_controller_spec.rb modified: spec/models/class_search_spec.rb modified: spec/models/module_audio_spec.rb modified: spec/spec_helper.rb modified: spec/support/shared_api_examples.rb --- app/controllers/home_controller.rb | 10 ++++++++-- app/models/permission.rb | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 46410f24..95fddc42 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -6,12 +6,18 @@ class HomeController < ApplicationController def index - - #the_search = Search.new( { :body_params => { :project_ids => [ 4 ],:site_ids => [ ],:audio_recording_ids => [ ] } } ) #params[:test1] = the_search #params[:test2] = the_search.execute_query.all #raise RuntimeError + + the_format = params[:format] + + if the_format.blank? + render + else + head :not_acceptable + end end end diff --git a/app/models/permission.rb b/app/models/permission.rb index 433874f7..21582e28 100644 --- a/app/models/permission.rb +++ b/app/models/permission.rb @@ -8,7 +8,7 @@ class Permission < ActiveRecord::Base belongs_to :permissionable, :polymorphic => true # attr - attr_accessible :level, :permissionable_type, :permissionable_id + attr_accessible :user_id, :level, :permissionable_type, :permissionable_id # userstamp stampable