Move test/rails/app_env/railtie/helpers_test into test/features

Author: tangrufus

test/rails/app_env/railtie/helpers_test.rb renamed to test/features/app_env_test.rb

@@ -1,33 +1,28 @@
-require_relative "../../../env_helpers"
+require_relative "../test_helper"
+require_relative "../env_helpers"
 
-module Rails::AppEnv::RailtieTest
-  class HelperTest < ActiveSupport::TestCase
+module Rails::AppEnv::FeaturesTest
+  class AppEnvTest < ActiveSupport::TestCase
     include EnvHelpers
 
-    test "Rails.app_env is an instance of ActiveSupport::EnvironmentInquirer when APP_ENV is present" do
-      switch_env "APP_ENV", nil do
-        assert_instance_of ActiveSupport::EnvironmentInquirer, Rails.app_env
+    test "Rails.app_env is a kind of ActiveSupport::EnvironmentInquirer when APP_ENV is present" do
+      switch_env "APP_ENV", "foo" do
+        assert_kind_of ActiveSupport::EnvironmentInquirer, Rails.app_env
       end
     end
 
     test "Rails.app_env is a kind of ActiveSupport::EnvironmentInquirer when APP_ENV is blank" do
-      switch_env "APP_ENV", "foo" do
+      switch_env "APP_ENV", nil do
         assert_kind_of ActiveSupport::EnvironmentInquirer, Rails.app_env
       end
     end
 
-    test "Rails.app_env is an instance of Rails::AppEnv::EnvironmentInquirer when APP_ENV is blank" do
+    test "Rails.app_env is an instance of Rails::AppEnv::EnvironmentInquirer when APP_ENV is present" do
       switch_env "APP_ENV", "foo" do
         assert_instance_of Rails::AppEnv::EnvironmentInquirer, Rails.app_env
       end
     end
 
-    test "Rails.app_env is set from APP_ENV" do
-      switch_env "APP_ENV", "foo" do
-        assert_equal "foo", Rails.app_env
-      end
-    end
-
     test "Rails.app_env is set from APP_ENV when both APP_ENV are RAILS_ENV present" do
       switch_env "APP_ENV", "foo" do
         with_rails_env("bar") do
@@ -37,7 +32,7 @@ class HelperTest < ActiveSupport::TestCase
       end
     end
 
-    test "Rails.app_env is set from APP_ENV when APP_ENV is present but not RAILS_ENV" do
+    test "Rails.app_env is set from APP_ENV when APP_ENV is present but RAILS_ENV is blank" do
       switch_env "APP_ENV", "foo" do
         with_rails_env(nil) do
           assert_equal "foo", Rails.app_env
@@ -46,7 +41,7 @@ class HelperTest < ActiveSupport::TestCase
       end
     end
 
-    test "Rails.app_env falls back to Rails.env when APP_ENV is blank" do
+    test "Rails.app_env falls back to Rails.env when APP_ENV is blank but RAILS_ENV is present" do
       switch_env "APP_ENV", nil do
         with_rails_env("foo") do
           assert_equal "foo", Rails.app_env
@@ -56,29 +51,51 @@ class HelperTest < ActiveSupport::TestCase
       end
     end
 
-    test "Rails.app_env falls back to Rails.env when APP_ENV is blank and follow its changes" do
+    test "Rails.app_env falls back to default Rails.env when both APP_ENV and RAILS_ENV are blank" do
       switch_env "APP_ENV", nil do
-        with_rails_env("foo") do
+        with_rails_env(nil) do
+          assert_equal DEFAULT_RAILS_ENV, Rails.app_env
+          assert_equal DEFAULT_RAILS_ENV, Rails.env
+          assert_same Rails.env, Rails.app_env
+        end
+      end
+    end
+
+    test "Rails.app_env does not follow Rails.env changes when both APP_ENV and RAILS_ENV are present" do
+      switch_env "APP_ENV", "foo" do
+        with_rails_env("bar") do
+          Rails.env = "baz"
+
+          assert_equal "foo", Rails.app_env
+          assert_equal "baz", Rails.env
+        end
+      end
+    end
+
+    test "Rails.app_env does not follow Rails.env changes when APP_ENV is present and RAILS_ENV is blank" do
+      switch_env "APP_ENV", "foo" do
+        with_rails_env(nil) do
           Rails.env = "bar"
 
-          assert_equal "bar", Rails.app_env
+          assert_equal "foo", Rails.app_env
           assert_equal "bar", Rails.env
-          assert_same Rails.env, Rails.app_env
         end
       end
     end
 
-    test "Rails.app_env falls back to Rails.env when both APP_ENV and RAILS_ENV are blank" do
+    test "Rails.app_env follows Rails.env changes when APP_ENV is blank but RAILS_ENV is present" do
       switch_env "APP_ENV", nil do
-        with_rails_env(nil) do
-          assert_equal DEFAULT_RAILS_ENV, Rails.app_env
-          assert_equal DEFAULT_RAILS_ENV, Rails.env
+        with_rails_env("foo") do
+          Rails.env = "bar"
+
+          assert_equal "bar", Rails.app_env
+          assert_equal "bar", Rails.env
           assert_same Rails.env, Rails.app_env
         end
       end
     end
 
-    test "Rails.app_env falls back to Rails.env when both APP_ENV and RAILS_ENV are blank and follow its changes" do
+    test "Rails.app_env follows Rails.env changes when both APP_ENV and RAILS_ENV are blank" do
       switch_env "APP_ENV", nil do
         with_rails_env(nil) do
           Rails.env = "foo"
@@ -89,16 +106,5 @@ class HelperTest < ActiveSupport::TestCase
         end
       end
     end
-
-    test "Rails.app_env is set from APP_ENV and does not follow Rails.env changes" do
-      switch_env "APP_ENV", "foo" do
-        with_rails_env("bar") do
-          Rails.env = "baz"
-
-          assert_equal "foo", Rails.app_env
-          assert_equal "baz", Rails.env
-        end
-      end
-    end
   end
 end