Merge remote-tracking branch 'origin/develop'

We'll only use the master branch for development from now on.

1 files changed, 3 insertions, 3 deletions

diff --git a/test/functional/static_config_controller_test.rb b/test/functional/static_config_controller_test.rb
index 9c2cfef..7027bf8 100644
--- a/test/functional/static_config_controller_test.rb
+++ b/test/functional/static_config_controller_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 
 # use minitest for stubbing, rather than bloated mocha
-require 'minitest/stub_const'
+require 'minitest/mock'
 
 class StaticConfigControllerTest < ActionController::TestCase
 
@@ -9,7 +9,7 @@ class StaticConfigControllerTest < ActionController::TestCase
   end
 
   def test_provider_success
-    StaticConfigController.stub_const(:PROVIDER_JSON, file_path('provider.json')) do
+    @controller.stub(:provider_json, file_path('provider.json')) do
       get :provider, format: :json
       assert_equal 'application/json', @response.content_type
       assert_response :success
@@ -17,7 +17,7 @@ class StaticConfigControllerTest < ActionController::TestCase
   end
 
   def test_provider_not_modified
-    StaticConfigController.stub_const(:PROVIDER_JSON, file_path('provider.json')) do
+    @controller.stub(:provider_json, file_path('provider.json')) do
       request.env["HTTP_IF_MODIFIED_SINCE"] = File.mtime(file_path('provider.json')).rfc2822()
       get :provider, format: :json
       assert_response 304