+
+ Check (URL encoded)
+
+
+
+
+
+ Rails on Maui Logo (absolute path)
+
+
+
+
+);
diff --git a/spec/dummy/client/app/components/CssModulesImagesFontsExample.scss b/spec/dummy/client/app/components/CssModulesImagesFontsExample.scss
new file mode 100644
index 000000000..a0c1dac3e
--- /dev/null
+++ b/spec/dummy/client/app/components/CssModulesImagesFontsExample.scss
@@ -0,0 +1,52 @@
+// Test out a custom font
+
+
+// TODO: Figure out how to get this in a global spot
+$font-family-sans-serif: 'OpenSans-Light'; // apply custom font
+$fonts-url-path: '../assets/fonts';
+@font-face {
+ font-family: 'OpenSans-Light';
+ src: url('#{$fonts-url-path}/OpenSans-Light.ttf') format('truetype');
+}
+.heading {
+ font-family: $font-family-sans-serif;
+}
+
+// Small image is url encode
+$check-svg: url("../assets/images/guest-list-accepted.png");
+$check-size: 132px;
+.check {
+ display: inline-block;
+ background: $check-svg;
+ background-size: $check-size $check-size;
+ width: $check-size;
+ height: $check-size;
+}
+
+// Relative path of larger image
+$last-call-svg: url("../assets/images/last-call.png");
+$last-call-width: 1440px;
+$last-call-height: 373px;
+
+.lastCall {
+ display: inline-block;
+ background: $last-call-svg;
+ background-size: $last-call-width/2 $last-call-height/2;
+ width: $last-call-width/2;
+ height: $last-call-height/2;
+}
+
+// This is an absolute path to the image, defined in app-variables.scss
+$images-url-path: '../assets/images';
+
+$rails-on-maui-width: 140px;
+$rails-on-maui-height: 40px;
+$rails-on-maui-png: url("#{$images-url-path}/logos/railsonmaui.png");
+
+.railsOnMaui {
+ display: inline-block;
+ background: $rails-on-maui-png;
+ background-size: $rails-on-maui-width $rails-on-maui-height;
+ width: $rails-on-maui-width;
+ height: $rails-on-maui-height;
+}
diff --git a/spec/dummy/client/app/startup/clientRegistration.jsx b/spec/dummy/client/app/startup/clientRegistration.jsx
index 3f2e8d67a..0c5671955 100644
--- a/spec/dummy/client/app/startup/clientRegistration.jsx
+++ b/spec/dummy/client/app/startup/clientRegistration.jsx
@@ -9,6 +9,7 @@ import ReduxApp from './ClientReduxApp';
import ReduxSharedStoreApp from './ClientReduxSharedStoreApp';
import RouterApp from './ClientRouterApp';
import PureComponent from '../components/PureComponent';
+import CssModulesImagesFontsExample from '../components/CssModulesImagesFontsExample';
import SharedReduxStore from '../stores/SharedReduxStore'
@@ -25,6 +26,7 @@ ReactOnRails.register({
HelloWorldApp,
RouterApp,
PureComponent,
+ CssModulesImagesFontsExample,
});
ReactOnRails.registerStore({
diff --git a/spec/dummy/client/app/startup/serverRegistration.jsx b/spec/dummy/client/app/startup/serverRegistration.jsx
index d8e35ed71..a020579f5 100644
--- a/spec/dummy/client/app/startup/serverRegistration.jsx
+++ b/spec/dummy/client/app/startup/serverRegistration.jsx
@@ -22,6 +22,7 @@ import ReduxSharedStoreApp from './ServerReduxSharedStoreApp';
import RouterApp from './ServerRouterApp';
import PureComponent from '../components/PureComponent';
+import CssModulesImagesFontsExample from '../components/CssModulesImagesFontsExample';
import SharedReduxStore from '../stores/SharedReduxStore';
@@ -35,6 +36,7 @@ ReactOnRails.register({
RouterApp,
HelloString,
PureComponent,
+ CssModulesImagesFontsExample,
});
ReactOnRails.registerStore({
diff --git a/spec/dummy/client/webpack.client.base.config.js b/spec/dummy/client/webpack.client.base.config.js
index c71e03bda..236a73139 100644
--- a/spec/dummy/client/webpack.client.base.config.js
+++ b/spec/dummy/client/webpack.client.base.config.js
@@ -24,6 +24,7 @@ module.exports = {
// This will contain the app entry points defined by webpack.hot.config and webpack.rails.config
app: [
+ // './app/assets/styles/global-styles.scss',
'./app/startup/clientRegistration',
],
},
@@ -60,9 +61,10 @@ module.exports = {
],
module: {
loaders: [
- { test: /\.(woff2?|svg)$/, loader: 'url?limit=10000' },
{ test: /\.(ttf|eot)$/, loader: 'file' },
- { test: /\.(jpe?g|png|gif|svg|ico)$/, loader: 'url?limit=10000' },
+
+ // Example to confirm that subdirectories work
+ { test: /\.(jpe?g|png|gif|svg|ico|woff2?)$/, loader: 'url?limit=10000&name=images/[hash].[ext]' },
{ test: require.resolve('jquery'), loader: 'expose?jQuery' },
{ test: require.resolve('jquery'), loader: 'expose?$' },
],
diff --git a/spec/dummy/config/environments/production.rb b/spec/dummy/config/environments/production.rb
index 861427f68..a09a2a196 100644
--- a/spec/dummy/config/environments/production.rb
+++ b/spec/dummy/config/environments/production.rb
@@ -22,7 +22,7 @@
# Disable serving static files from the `/public` folder by default since
# Apache or NGINX already handles this.
- config.serve_static_files = ENV["RAILS_SERVE_STATIC_FILES"].present?
+ config.serve_static_files = true
# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier
diff --git a/spec/dummy/config/initializers/react_on_rails.rb b/spec/dummy/config/initializers/react_on_rails.rb
index 6e2e87ec5..da9d44325 100644
--- a/spec/dummy/config/initializers/react_on_rails.rb
+++ b/spec/dummy/config/initializers/react_on_rails.rb
@@ -2,9 +2,13 @@ module RenderingExtension
# Return a Hash that contains custom values from the view context that will get passed to
# all calls to react_component and redux_store for rendering
def self.custom_context(view_context)
- {
- somethingUseful: view_context.session[:something_useful]
- }
+ if view_context.controller.is_a?(ActionMailer::Base)
+ {}
+ else
+ {
+ somethingUseful: view_context.session[:something_useful]
+ }
+ end
end
end
@@ -14,7 +18,7 @@ def self.custom_context(view_context)
config.generated_assets_dir = File.join(%w(app assets webpack))
# Define the files we need to check for webpack compilation when running tests.
- config.webpack_generated_files = %w( app-bundle.js vendor-bundle.js server-bundle.js )
+ config.webpack_generated_files = %w(app-bundle.js vendor-bundle.js server-bundle.js)
# This is the file used for server rendering of React when using `(prerender: true)`
# If you are never using server rendering, you may set this to "".
@@ -81,7 +85,7 @@ def self.custom_context(view_context)
config.server_render_method = "ExecJS"
# Client js uses assets not digested by rails.
- # For any asset matching this regex, non-digested symlink will be created
- # To disable symlinks set this parameter to nil.
- config.symlink_non_digested_assets_regex = /\.(png|jpg|jpeg|gif|tiff|woff|ttf|eot|svg)/
+ # For any asset matching this regex, a file is copied to the correct path to have a digest.
+ # To disable creating digested assets, set this parameter to nil.
+ config.symlink_non_digested_assets_regex = /\.(png|jpg|jpeg|gif|tiff|woff|ttf|eot|svg|map)/
end
diff --git a/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb
index cfcc14ff6..8589d4313 100644
--- a/spec/dummy/config/routes.rb
+++ b/spec/dummy/config/routes.rb
@@ -23,4 +23,5 @@
get "render_js" => "pages#render_js"
get "react_router(/*all)" => "react_router#index", as: :react_router
get "pure_component" => "pages#pure_component"
+ get "css_modules_images_fonts_example" => "pages#css_modules_images_fonts_example"
end
diff --git a/spec/dummy/config/secrets.yml b/spec/dummy/config/secrets.yml
index 60ab807f9..10b53274a 100644
--- a/spec/dummy/config/secrets.yml
+++ b/spec/dummy/config/secrets.yml
@@ -19,4 +19,5 @@ test:
# Do not keep production secrets in the repository,
# instead read values from the environment.
production:
- secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+ secret_key_base: <%= ENV["SECRET_KEY_BASE"].presence ||
+ "8cd24e99fc1b68f6cd1592e4db8c88c2b508dbd12a37dd0cef184eb46aa5e3512f386d02c7a29971b8e34a9daa627642fc4a03b9c49e28f1943ea9028c91ba47" %>
diff --git a/spec/dummy/package.json b/spec/dummy/package.json
index 0b44a53c9..177ff7c88 100644
--- a/spec/dummy/package.json
+++ b/spec/dummy/package.json
@@ -12,7 +12,7 @@
"test": "npm run build:test && npm run lint && rspec",
"lint": "cd client && npm run lint",
"install-react-on-rails": "cd client && npm run install-react-on-rails",
- "build:clean": "rm app/assets/webpack/* || true",
+ "build:clean": "rm -r app/assets/webpack/* || true",
"build:production:client": "(cd client && npm run build:production:client --silent)",
"build:production:server": "(cd client && npm run build:production:server --silent)",
"build:client": "(cd client && npm run build:client --silent",
diff --git a/spec/dummy/spec/requests/server_render_check_spec.rb b/spec/dummy/spec/requests/server_render_check_spec.rb
index 8840de2f0..57c533375 100644
--- a/spec/dummy/spec/requests/server_render_check_spec.rb
+++ b/spec/dummy/spec/requests/server_render_check_spec.rb
@@ -58,6 +58,22 @@
end
end
+ describe "server render mailer" do
+ it "sends email okay" do
+ mail = DummyMailer.hello_email
+ expect(mail.subject).to match "mail"
+ expect(mail.body).to match "Mr. Mailing Server Side Rendering"
+ expect(mail.body).to match "inMailer":true"
+ end
+
+ it "sets inMailer properly" do
+ get client_side_hello_world_path
+ html_nodes = Nokogiri::HTML(response.body)
+ expect(html_nodes.css("div#js-react-on-rails-context").attr("data-rails-context").value)
+ .to match('inMailer\":false')
+ end
+ end
+
describe "server rendering railsContext" do
let(:http_accept_language) { "en-US,en;q=0.8" }
diff --git a/spec/react_on_rails/assets_precompile_spec.rb b/spec/react_on_rails/assets_precompile_spec.rb
new file mode 100644
index 000000000..fe8c12685
--- /dev/null
+++ b/spec/react_on_rails/assets_precompile_spec.rb
@@ -0,0 +1,114 @@
+require_relative "spec_helper"
+require "react_on_rails/assets_precompile"
+
+require "tmpdir"
+require "tempfile"
+
+module ReactOnRails
+ RSpec.describe AssetsPrecompile do
+ let(:assets_path) { Pathname.new(Dir.mktmpdir) }
+
+ describe "#symlink_file" do
+ it "creates a proper symlink" do
+ filename = File.basename(Tempfile.new("tempfile", assets_path))
+ digest_filename = "#{filename}_digest"
+ AssetsPrecompile.new(assets_path: assets_path)
+ .symlink_file(filename, digest_filename)
+
+ expect(assets_path.join(digest_filename).lstat.symlink?).to be true
+ expect(File.identical?(assets_path.join(filename),
+ assets_path.join(digest_filename))).to be true
+ end
+
+ it "creates a proper symlink when nested" do
+ Dir.mkdir assets_path.join("images")
+ filename = "images/" + File.basename(Tempfile.new("tempfile",
+ assets_path.join("images")))
+ digest_filename = "#{filename}_digest"
+ AssetsPrecompile.new(assets_path: assets_path)
+ .symlink_file(filename, digest_filename)
+
+ expect(assets_path.join(digest_filename).lstat.symlink?).to be true
+ expect(File.identical?(assets_path.join(filename),
+ assets_path.join(digest_filename))).to be true
+ end
+ end
+
+ describe "symlink_non_digested_assets" do
+ let(:digest_filename) { "alfa.12345.js" }
+ let(:nondigest_filename) { "alfa.js" }
+
+ let(:checker) do
+ f = File.new(assets_path.join("manifest-alfa.json"), "w")
+ f.write("{\"assets\":{\"#{nondigest_filename}\": \"#{digest_filename}\"}}")
+ f.close
+
+ AssetsPrecompile.new(assets_path: assets_path,
+ symlink_non_digested_assets_regex: Regexp.new('.*\.js$'))
+ end
+
+ context "correct nondigest filename" do
+ it "create valid symlink" do
+ FileUtils.touch assets_path.join(digest_filename)
+ checker.symlink_non_digested_assets
+
+ expect(assets_path.join(nondigest_filename).lstat.symlink?).to be true
+ expect(File.identical?(assets_path.join(nondigest_filename),
+ assets_path.join(digest_filename))).to be true
+ end
+ end
+
+ context "zipped nondigest filename" do
+ it "create valid symlink" do
+ FileUtils.touch assets_path.join("#{digest_filename}.gz")
+ checker.symlink_non_digested_assets
+
+ expect(assets_path.join("#{nondigest_filename}.gz").lstat.symlink?).to be true
+ expect(File.identical?(assets_path.join("#{nondigest_filename}.gz"),
+ assets_path.join("#{digest_filename}.gz"))).to be true
+ end
+ end
+
+ context "wrong nondigest filename" do
+ it "should not create symlink" do
+ FileUtils.touch assets_path.join("alfa.12345.jsx")
+ checker.symlink_non_digested_assets
+
+ expect(assets_path.join("alfa.jsx")).not_to exist
+ end
+ end
+ end
+
+ describe "delete_broken_symlinks" do
+ it "deletes a broken symlink" do
+ filename = File.basename(Tempfile.new("tempfile", assets_path))
+ digest_filename = "#{filename}_digest"
+
+ a = AssetsPrecompile.new(assets_path: assets_path)
+ a.symlink_file(filename, digest_filename)
+ File.unlink(assets_path.join(filename))
+ a.delete_broken_symlinks
+
+ expect(assets_path.join(filename)).not_to exist
+ expect(assets_path.join(digest_filename)).not_to exist
+ end
+ end
+
+ describe "clobber" do
+ it "deletes files in ReactOnRails.configuration.generated_assets_dir" do
+ allow(Rails).to receive(:root).and_return(Pathname.new(Dir.mktmpdir))
+
+ generated_assets_dir = "generated_dir"
+ generated_assets_path = Rails.root.join(generated_assets_dir)
+ Dir.mkdir generated_assets_path
+
+ filepath = Pathname.new(Tempfile.new("tempfile", generated_assets_path))
+
+ AssetsPrecompile.new(assets_path: assets_path,
+ generated_assets_dir: generated_assets_dir).clobber
+
+ expect(filepath).not_to exist
+ end
+ end
+ end
+end
diff --git a/spec/react_on_rails/test_helper/ensure_assets_compiled_spec.rb b/spec/react_on_rails/test_helper/ensure_assets_compiled_spec.rb
index 4898f4500..7faf8bac1 100644
--- a/spec/react_on_rails/test_helper/ensure_assets_compiled_spec.rb
+++ b/spec/react_on_rails/test_helper/ensure_assets_compiled_spec.rb
@@ -8,7 +8,7 @@
context "when assets are not up to date" do
let(:assets_checker) do
double_assets_checker(stale_generated_webpack_files:
- %w( client-bundle.js server-bundle.js ))
+ %w(client-bundle.js server-bundle.js))
end
it "compiles the webpack assets" do
diff --git a/spec/react_on_rails/test_helper/webpack_assets_status_checker_spec.rb b/spec/react_on_rails/test_helper/webpack_assets_status_checker_spec.rb
index 254defe30..4c127d6c5 100644
--- a/spec/react_on_rails/test_helper/webpack_assets_status_checker_spec.rb
+++ b/spec/react_on_rails/test_helper/webpack_assets_status_checker_spec.rb
@@ -5,7 +5,7 @@
describe "#stale_generated_webpack_files" do
let(:client_dir) { client_dir_for(fixture_dirname) }
let(:generated_assets_dir) { compiled_js_dir_for(fixture_dirname) }
- let(:webpack_generated_files) { %w( client-bundle.js server-bundle.js ) }
+ let(:webpack_generated_files) { %w(client-bundle.js server-bundle.js) }
let(:server_bundle_js_file) { File.join(generated_assets_dir, "server-bundle.js") }
let(:client_bundle_js_file) { File.join(generated_assets_dir, "client-bundle.js") }
diff --git a/spec/react_on_rails/version_checker_spec.rb b/spec/react_on_rails/version_checker_spec.rb
index 37fa09234..fc1462c4b 100644
--- a/spec/react_on_rails/version_checker_spec.rb
+++ b/spec/react_on_rails/version_checker_spec.rb
@@ -47,6 +47,24 @@ module ReactOnRails
expect(logger.message).to be_nil
end
end
+
+ context "when package json uses a one-digit version string" do
+ let(:node_package_version) do
+ double_package_version(raw: "^6", major: "6")
+ end
+
+ it "does not log a warning" do
+ stub_gem_version("6")
+ check_version(node_package_version, logger)
+ expect(logger.message).to be_nil
+ end
+
+ it "logs a warning" do
+ stub_gem_version("5")
+ check_version(node_package_version, logger)
+ expect(logger.message).to be_present
+ end
+ end
end
def double_package_version(raw: nil, major: nil, relative_path: false)