diff options
author | Azul <azul@riseup.net> | 2016-05-03 11:29:45 -0300 |
---|---|---|
committer | Azul <azul@riseup.net> | 2016-05-03 11:49:24 -0300 |
commit | 33e2a52f683697ca8489d856df90b39bfbbe7373 (patch) | |
tree | 0cec8c6b9f3a20174089bb7633d7a075c53a5e90 /test/functional | |
parent | fc066a42ec5a3271b0d476ff2c5ab771f1ab726d (diff) |
use APP_CONFIG[config_file_paths] for provider.json
This avoids overwriting the PROVIDER_JSON constant in the
StaticConfigController and thus fixes test warnings.
Also moved away from using instance variables in the
ControllerExtension::JsonFile - instead querying the corresponding
functions now - less sideeffects and easier stubbing.
Diffstat (limited to 'test/functional')
-rw-r--r-- | test/functional/static_config_controller_test.rb | 6 |
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 |