dealing with rails 3.2 deprecation warning
Oleg
committed Mar 15, 2012
commit 6da93cb2d235384b23af29a3ae27976106b456ed
Showing 2
changed files with
2 additions
and 2 deletions
app/models/cms/layout.rb
+1
-1
| @@ | @@ -49,7 +49,7 @@ class Cms::Layout < ActiveRecord::Base |
| def self.app_layouts_for_select | |
| Dir.glob(File.expand_path('app/views/layouts/**/*.html.*', Rails.root)).collect do |filename| | |
| filename.gsub!("#{File.expand_path('app/views/layouts', Rails.root)}/", '') | |
| - | filename.split('/').last[0...1] == '_' ? nil : filename |
| + | filename.split('/').last[0...1] == '_' ? nil : filename.split('.').first |
| end.compact.sort | |
| end | |
test/unit/models/layout_test.rb
+1
-1
| @@ | @@ -55,7 +55,7 @@ class CmsLayoutTest < ActiveSupport::TestCase |
| FileUtils.touch(File.expand_path('app/views/layouts/_partial.html.erb', Rails.root)) | |
| FileUtils.touch(File.expand_path('app/views/layouts/not_a_layout.erb', Rails.root)) | |
| - | assert_equal ['cms_admin.html.erb', 'cms_admin/nested.html.erb'], Cms::Layout.app_layouts_for_select |
| + | assert_equal ['cms_admin', 'cms_admin/nested'], Cms::Layout.app_layouts_for_select |
| FileUtils.rm(File.expand_path('app/views/layouts/cms_admin/nested.html.erb', Rails.root)) | |
| FileUtils.rm(File.expand_path('app/views/layouts/_partial.html.erb', Rails.root)) | |