Skip to content

Commit

Permalink
Merge pull request #17 from howaboutwe/master
Browse files Browse the repository at this point in the history
vestigial spec removal; blank link fix in Ruby 1.9
  • Loading branch information
fhwang committed Feb 10, 2012
2 parents f8e3f44 + 3359acb commit 49afe92
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 2 additions & 3 deletions Rakefile
Expand Up @@ -2,9 +2,8 @@ require 'grancher/task'
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
require 'spec/rake/spectask'

desc 'Default: run all specs across all supported Rails gem versions.'
desc 'Default: run all tests across all supported Rails gem versions.'
task :default => :test

# run with rake publish
Expand All @@ -24,7 +23,7 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
rdoc.rdoc_files.include('lib/**/*.rb')
end

desc 'Run all specs across all supported Rails gem versions.'
desc 'Run all tests across all supported Rails gem versions.'
task :test do
base = Dir.pwd
version_dirs = %w(rails_3_0 rails_3_0_mysql rails_3_1)
Expand Down
6 changes: 4 additions & 2 deletions lib/admin_assistant.rb
Expand Up @@ -186,8 +186,10 @@ def search_settings
def supports_action?(action)
@memoized_action_booleans ||= {}
unless @memoized_action_booleans.has_key?(action)
@memoized_action_booleans[action] =
@controller_class.public_instance_methods.include?(action)
@memoized_action_booleans[action] =
@controller_class.public_instance_methods.any? { |meth|
meth.to_sym == action.to_sym
}
end
@memoized_action_booleans[action]
end
Expand Down

0 comments on commit 49afe92

Please sign in to comment.