Merge pull request #2315 from alphagov/use-govuk-environment-name-vs-…

…instance-name

Use GOVUK_ENVIRONMENT_NAME vs INSTANCE_NAME env var

app/models/govuk_environment.rb

@@ -3,7 +3,7 @@ def self.name
     if Rails.env.development? || Rails.env.test?
       "development"
     else
-      ENV["INSTANCE_NAME"]
+      ENV["GOVUK_ENVIRONMENT_NAME"]
     end
   end
 

config/initializers/govuk_admin_template.rb

@@ -1,3 +1,5 @@
+require "govuk_environment"
+
 # We were setting app_title here, but we needed to use the department.name from
 # localisations, which aren't available in initializers. Our solution was to move
 # it to app/views/application.html.erb.
@@ -6,5 +8,5 @@
   c.disable_google_analytics = false
 end
 
-GovukAdminTemplate.environment_label = ENV.fetch("GOVUK_ENVIRONMENT_NAME", "development").titleize
-GovukAdminTemplate.environment_style = ENV["GOVUK_ENVIRONMENT_NAME"] == "production" ? "production" : "preview"
+GovukAdminTemplate.environment_label = GovukEnvironment.name.titleize
+GovukAdminTemplate.environment_style = GovukEnvironment.production? ? "production" : "preview"

test/models/govuk_environment_test.rb

@@ -28,11 +28,11 @@ class GovukEnvironmentTest < ActionMailer::TestCase
       setup do
         Rails.env.stubs(:development?).returns(false)
         Rails.env.stubs(:test?).returns(false)
-        ENV.stubs(:[]).with("INSTANCE_NAME").returns("instance-name")
+        ENV.stubs(:[]).with("GOVUK_ENVIRONMENT_NAME").returns("govuk-environment-name")
       end
 
-      should "return value of INSTANCE_NAME env var" do
-        assert_equal "instance-name", GovukEnvironment.name
+      should "return value of GOVUK_ENVIRONMENT_NAME env var" do
+        assert_equal "govuk-environment-name", GovukEnvironment.name
       end
     end
   end