Skip to content

Commit

Permalink
Added tests for show action in controller specs. Added tests for home…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
Mark Cottman-Fields committed Jan 21, 2013
1 parent 66bd2ec commit 717ded7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
10 changes: 8 additions & 2 deletions app/controllers/home_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion app/models/permission.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 717ded7

Please sign in to comment.