Permalink
Browse files

Fix merge conflict

  • Loading branch information...
1 parent 945c44c commit 5f8b8c310efc38b1719f0802c93b74974b469b94 @rafaelfranca rafaelfranca committed Apr 15, 2014
Showing with 0 additions and 10 deletions.
  1. +0 −10 railties/test/application/configuration_test.rb
View
10 railties/test/application/configuration_test.rb
@@ -794,16 +794,6 @@ def index
assert ActiveRecord::Base.dump_schema_after_migration
end
- test "config.annotations wrapping SourceAnnotationExtractor::Annotation class" do
- make_basic_app do |app|
- app.config.annotations.register_extensions("coffee") do |tag|
- /#\s*(#{tag}):?\s*(.*)$/
- end
- end
-
- assert_not_nil SourceAnnotationExtractor::Annotation.extensions[/\.(coffee)$/]
- end
-
test "rake_tasks block works at instance level" do
$ran_block = false

0 comments on commit 5f8b8c3

Please sign in to comment.