summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2017-01-30 08:26:39 -0700
committermo khan <mo@mokhan.ca>2017-01-30 08:26:39 -0700
commite221bdc81c580e29127a9fe18274e437d1210538 (patch)
tree9ac5e702f6264628302abaa528ab7cc329853b6a
parent2b6ac01422b4eac7f527d516ee78843e7dd0bb87 (diff)
ensure gem works with Rails 4.2v0.1.0main
-rw-r--r--app/controllers/bloodpressure/health_controller.rb2
-rw-r--r--bloodpressure.gemspec4
-rw-r--r--test/dummy/config/environments/test.rb12
-rw-r--r--test/dummy/config/initializers/new_framework_defaults.rb24
-rw-r--r--test/test_helper.rb2
5 files changed, 23 insertions, 21 deletions
diff --git a/app/controllers/bloodpressure/health_controller.rb b/app/controllers/bloodpressure/health_controller.rb
index abb59f5..2583333 100644
--- a/app/controllers/bloodpressure/health_controller.rb
+++ b/app/controllers/bloodpressure/health_controller.rb
@@ -4,7 +4,7 @@ module Bloodpressure
class HealthController < ApplicationController
def show
@hostname = Socket.gethostname
- render status: http_status
+ render layout: nil, status: http_status
end
private
diff --git a/bloodpressure.gemspec b/bloodpressure.gemspec
index 13ab0c8..0352b33 100644
--- a/bloodpressure.gemspec
+++ b/bloodpressure.gemspec
@@ -9,14 +9,14 @@ Gem::Specification.new do |s|
s.version = Bloodpressure::VERSION
s.authors = ["mo khan"]
s.email = ["mo@mokhan.ca"]
- s.homepage = "http://www.mokhan.ca"
+ s.homepage = "https://github.com/mokhan/bloodpressure"
s.summary = "Summary of Bloodpressure."
s.description = "Description of Bloodpressure."
s.license = "MIT"
s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
- s.add_dependency "rails", "~> 5.0.1"
+ s.add_dependency "rails", "~> 4.2.7"
s.add_development_dependency "sqlite3"
end
diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
index 30587ef..08258fb 100644
--- a/test/dummy/config/environments/test.rb
+++ b/test/dummy/config/environments/test.rb
@@ -13,10 +13,10 @@ Rails.application.configure do
config.eager_load = false
# Configure public file server for tests with Cache-Control for performance.
- config.public_file_server.enabled = true
- config.public_file_server.headers = {
- 'Cache-Control' => 'public, max-age=3600'
- }
+ #config.public_file_server.enabled = true
+ #config.public_file_server.headers = {
+ #'Cache-Control' => 'public, max-age=3600'
+ #}
# Show full error reports and disable caching.
config.consider_all_requests_local = true
@@ -27,7 +27,7 @@ Rails.application.configure do
# Disable request forgery protection in test environment.
config.action_controller.allow_forgery_protection = false
- config.action_mailer.perform_caching = false
+ #config.action_mailer.perform_caching = false
# Tell Action Mailer not to deliver emails to the real world.
# The :test delivery method accumulates sent emails in the
@@ -39,4 +39,6 @@ Rails.application.configure do
# Raises error for missing translations
# config.action_view.raise_on_missing_translations = true
+ config.active_support.test_order = :random
end
+
diff --git a/test/dummy/config/initializers/new_framework_defaults.rb b/test/dummy/config/initializers/new_framework_defaults.rb
index 671abb6..a3bc799 100644
--- a/test/dummy/config/initializers/new_framework_defaults.rb
+++ b/test/dummy/config/initializers/new_framework_defaults.rb
@@ -5,20 +5,20 @@
# Read the Guide for Upgrading Ruby on Rails for more info on each option.
# Enable per-form CSRF tokens. Previous versions had false.
-Rails.application.config.action_controller.per_form_csrf_tokens = true
+#Rails.application.config.action_controller.per_form_csrf_tokens = true
-# Enable origin-checking CSRF mitigation. Previous versions had false.
-Rails.application.config.action_controller.forgery_protection_origin_check = true
+## Enable origin-checking CSRF mitigation. Previous versions had false.
+#Rails.application.config.action_controller.forgery_protection_origin_check = true
-# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
-# Previous versions had false.
-ActiveSupport.to_time_preserves_timezone = true
+## Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
+## Previous versions had false.
+#ActiveSupport.to_time_preserves_timezone = true
-# Require `belongs_to` associations by default. Previous versions had false.
-Rails.application.config.active_record.belongs_to_required_by_default = true
+## Require `belongs_to` associations by default. Previous versions had false.
+#Rails.application.config.active_record.belongs_to_required_by_default = true
-# Do not halt callback chains when a callback returns false. Previous versions had true.
-ActiveSupport.halt_callback_chains_on_return_false = false
+## Do not halt callback chains when a callback returns false. Previous versions had true.
+#ActiveSupport.halt_callback_chains_on_return_false = false
-# Configure SSL options to enable HSTS with subdomains. Previous versions had false.
-Rails.application.config.ssl_options = { hsts: { subdomains: true } }
+## Configure SSL options to enable HSTS with subdomains. Previous versions had false.
+#Rails.application.config.ssl_options = { hsts: { subdomains: true } }
diff --git a/test/test_helper.rb b/test/test_helper.rb
index ac20b6e..8c6ad66 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -15,6 +15,6 @@ Minitest.backtrace_filter = Minitest::BacktraceFilter.new
if ActiveSupport::TestCase.respond_to?(:fixture_path=)
ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
- ActiveSupport::TestCase.file_fixture_path = ActiveSupport::TestCase.fixture_path + "/files"
+ #ActiveSupport::TestCase.file_fixture_path = ActiveSupport::TestCase.fixture_path + "/files"
ActiveSupport::TestCase.fixtures :all
end