Skip to content

Commit e5285ff

Browse files
committed
Conditionally check by Rails < 4.2 configs
1 parent f1d1dae commit e5285ff

File tree

8 files changed

+38
-6
lines changed

8 files changed

+38
-6
lines changed

test/fixtures/alternate_config_project/config/environments/production.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# Disable Rails's static asset server (Apache or nginx will already do this)
1414
if config.respond_to?(:public_file_server)
1515
config.public_file_server.enabled = false
16+
elsif config.respond_to?(:serve_static_files)
17+
config.serve_static_files = false
1618
else
1719
config.serve_static_assets = false
1820
end

test/fixtures/alternate_config_project/config/environments/test.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,16 @@
1010
# Configure static asset server for tests with Cache-Control for performance
1111
if config.respond_to?(:public_file_server)
1212
config.public_file_server.enabled = true
13+
elsif config.respond_to?(:serve_static_files)
14+
config.serve_static_files = true
1315
else
1416
config.serve_static_assets = true
1517
end
16-
config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
18+
if config.respond_to?(:public_file_server)
19+
config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
20+
else
21+
config.static_cache_control = "public, max-age=3600"
22+
end
1723

1824
config.eager_load = false
1925

test/fixtures/engine_project/test/dummy/config/environments/production.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
# Disable Rails's static asset server (Apache or nginx will already do this).
2323
if config.respond_to?(:public_file_server)
2424
config.public_file_server.enabled = false
25+
elsif config.respond_to?(:serve_static_files)
26+
config.serve_static_files = false
2527
else
2628
config.serve_static_assets = false
2729
end

test/fixtures/engine_project/test/dummy/config/environments/test.rb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,17 @@
1414

1515
# Configure static asset server for tests with Cache-Control for performance.
1616
if config.respond_to?(:public_file_server)
17-
config.public_file_server.enabled = false
17+
config.public_file_server.enabled = true
18+
elsif config.respond_to?(:serve_static_files)
19+
config.serve_static_files = true
1820
else
1921
config.serve_static_assets = true
2022
end
21-
config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
23+
if config.respond_to?(:public_file_server)
24+
config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
25+
else
26+
config.static_cache_control = "public, max-age=3600"
27+
end
2228

2329
# Show full error reports and disable caching.
2430
config.consider_all_requests_local = true

test/fixtures/sass_project/config/environments/production.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
# Disable Rails's static asset server (Apache or nginx will already do this)
1515
if config.respond_to?(:public_file_server)
1616
config.public_file_server.enabled = false
17+
elsif config.respond_to?(:serve_static_files)
18+
config.serve_static_files = false
1719
else
1820
config.serve_static_assets = false
1921
end

test/fixtures/sass_project/config/environments/test.rb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,17 @@
1212

1313
# Configure static asset server for tests with Cache-Control for performance
1414
if config.respond_to?(:public_file_server)
15-
config.public_file_server.enabled = false
15+
config.public_file_server.enabled = true
16+
elsif config.respond_to?(:serve_static_files)
17+
config.serve_static_files = true
1618
else
1719
config.serve_static_assets = true
1820
end
19-
config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
21+
if config.respond_to?(:public_file_server)
22+
config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
23+
else
24+
config.static_cache_control = "public, max-age=3600"
25+
end
2026

2127
# Show full error reports and disable caching
2228
config.consider_all_requests_local = true

test/fixtures/scss_project/config/environments/production.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# Disable Rails's static asset server (Apache or nginx will already do this)
1414
if config.respond_to?(:public_file_server)
1515
config.public_file_server.enabled = false
16+
elsif config.respond_to?(:serve_static_files)
17+
config.serve_static_files = false
1618
else
1719
config.serve_static_assets = false
1820
end

test/fixtures/scss_project/config/environments/test.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,16 @@
1212
# Configure static asset server for tests with Cache-Control for performance
1313
if config.respond_to?(:public_file_server)
1414
config.public_file_server.enabled = true
15+
elsif config.respond_to?(:serve_static_files)
16+
config.serve_static_files = true
1517
else
1618
config.serve_static_assets = true
1719
end
18-
config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
20+
if config.respond_to?(:public_file_server)
21+
config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
22+
else
23+
config.static_cache_control = "public, max-age=3600"
24+
end
1925

2026
# Show full error reports and disable caching
2127
config.consider_all_requests_local = true

0 commit comments

Comments
 (0)