5 files changed, 0 insertions, 108 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index b9d18f4582..ae1127b509 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -582,27 +582,6 @@ module ApplicationTests
       assert app.config.colorize_logging
     end
 
-    test "config.active_record.observers" do
-      add_to_config <<-RUBY
-        config.active_record.observers = :foo_observer
-      RUBY
-
-      app_file 'app/models/foo.rb', <<-RUBY
-        class Foo < ActiveRecord::Base
-        end
-      RUBY
-
-      app_file 'app/models/foo_observer.rb', <<-RUBY
-        class FooObserver < ActiveRecord::Observer
-        end
-      RUBY
-
-      require "#{app_path}/config/environment"
-
-      ActiveRecord::Base
-      assert defined?(FooObserver)
-    end
-
     test "config.session_store with :active_record_store with activerecord-session_store gem" do
       begin
         make_basic_app do |app|
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index f372afa51c..3cb3643e3a 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -95,21 +95,4 @@ class ConsoleTest < ActiveSupport::TestCase
     load_environment(true)
     assert value
   end
-
-  def test_active_record_does_not_panic_when_referencing_an_observed_constant
-    add_to_config "config.active_record.observers = :user_observer"
-
-    app_file "app/models/user.rb", <<-MODEL
-      class User < ActiveRecord::Base
-      end
-    MODEL
-
-    app_file "app/models/user_observer.rb", <<-MODEL
-      class UserObserver < ActiveRecord::Observer
-      end
-    MODEL
-
-    load_environment
-    assert_nothing_raised { User }
-  end
 end
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 076c5b3bbd..f2234ab111 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -249,28 +249,6 @@ module ApplicationTests
       assert !File.exists?(File.join(app_path, 'db', 'schema_cache.dump'))
     end
 
-    def test_load_activerecord_base_when_we_use_observers
-      Dir.chdir(app_path) do
-        `bundle exec rails g model user;
-         bundle exec rake db:migrate;
-         bundle exec rails g observer user;`
-
-        add_to_config "config.active_record.observers = :user_observer"
-
-        assert_equal "0", `bundle exec rails r "puts User.count"`.strip
-
-        app_file "lib/tasks/count_user.rake", <<-RUBY
-          namespace :user do
-            task count: :environment do
-              puts User.count
-            end
-          end
-        RUBY
-
-        assert_equal "0", `bundle exec rake user:count`.strip
-      end
-    end
-
     def test_copy_templates
       Dir.chdir(app_path) do
         `bundle exec rake rails:templates:copy`
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index db268ed6f2..a4d8b3d1b0 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -1,7 +1,6 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/controller/controller_generator'
 require 'rails/generators/rails/model/model_generator'
-require 'rails/generators/rails/observer/observer_generator'
 require 'rails/generators/mailer/mailer_generator'
 require 'rails/generators/rails/scaffold/scaffold_generator'
 
@@ -142,26 +141,6 @@ class NamespacedModelGeneratorTest < NamespacedGeneratorTestCase
   end
 end
 
-class NamespacedObserverGeneratorTest < NamespacedGeneratorTestCase
-  arguments %w(account)
-  tests Rails::Generators::ObserverGenerator
-
-  def test_invokes_default_orm
-    run_generator
-    assert_file "app/models/test_app/account_observer.rb", /module TestApp/, /  class AccountObserver < ActiveRecord::Observer/
-  end
-
-  def test_invokes_default_orm_with_class_path
-    run_generator ["admin/account"]
-    assert_file "app/models/test_app/admin/account_observer.rb", /module TestApp/, /  class Admin::AccountObserver < ActiveRecord::Observer/
-  end
-
-  def test_invokes_default_test_framework
-    run_generator
-    assert_file "test/models/test_app/account_observer_test.rb", /module TestApp/, /  class AccountObserverTest < ActiveSupport::TestCase/
-  end
-end
-
 class NamespacedMailerGeneratorTest < NamespacedGeneratorTestCase
   arguments %w(notifier foo bar)
   tests Rails::Generators::MailerGenerator
diff --git a/railties/test/generators/observer_generator_test.rb b/railties/test/generators/observer_generator_test.rb
deleted file mode 100644
index 1231827466..0000000000
--- a/railties/test/generators/observer_generator_test.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'generators/generators_test_helper'
-require 'rails/generators/rails/observer/observer_generator'
-
-class ObserverGeneratorTest < Rails::Generators::TestCase
-  include GeneratorsTestHelper
-  arguments %w(account)
-
-  def test_invokes_default_orm
-    run_generator
-    assert_file "app/models/account_observer.rb", /class AccountObserver < ActiveRecord::Observer/
-  end
-
-  def test_invokes_default_orm_with_class_path
-    run_generator ["admin/account"]
-    assert_file "app/models/admin/account_observer.rb", /class Admin::AccountObserver < ActiveRecord::Observer/
-  end
-
-  def test_invokes_default_test_framework
-    run_generator
-    assert_file "test/models/account_observer_test.rb", /class AccountObserverTest < ActiveSupport::TestCase/
-  end
-
-  def test_logs_if_the_test_framework_cannot_be_found
-    content = run_generator ["account", "--test-framework=rspec"]
-    assert_match(/rspec \[not found\]/, content)
-  end
-end