Permalink
Browse files

Updated specs to rspec 1.2.9

  • Loading branch information...
1 parent 3388ff6 commit 061aa85c6f758c3d020e193f4f300c9a32c5048e Dimitrij Denissenko committed Oct 18, 2009
Showing with 4 additions and 3 deletions.
  1. +2 −2 config/routes.rb
  2. +2 −1 lib/routing_filter/central_project.rb
View
@@ -58,8 +58,8 @@
admin.resources :users, :collection => { :search => :any }
admin.resources :groups
admin.resources :tasks, :collection => { :save => :put }
- admin.setup 'setup.:format', :controller => 'setup', :format => 'html', :conditions => { :method => :get }
- admin.setup 'setup.:format', :controller => 'setup', :action => 'save', :format => 'html', :conditions => { :method => :put }
+ admin.setup 'setup.:format', :controller => 'setup', :conditions => { :method => :get }
+ admin.setup 'setup.:format', :controller => 'setup', :action => 'save', :conditions => { :method => :put }
admin.extensions 'extensions', :controller => 'extensions'
end
@@ -10,7 +10,8 @@ def around_recognize(path, environment, &block)
end
def around_generate(*args, &block)
- returning yield do |path|
+ returning yield do |result|
+ path = result.is_a?(Array) ? result.first : result # In case generate_extras returns an Array
if Project.central and path !~ /^#{central_project_expression}\.rss/
path.sub!(/^#{central_project_expression}(.+)$/, '\1\2')
end

0 comments on commit 061aa85

Please sign in to comment.