From cf5a7109d28a4e2b3baea28e2dcda1cb01543b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Tue, 18 Jul 2017 14:23:14 +0200 Subject: [PATCH 01/30] change i18n directory check --- lib/react_on_rails/locales_to_js.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/react_on_rails/locales_to_js.rb b/lib/react_on_rails/locales_to_js.rb index e6414b5be..0eef19876 100644 --- a/lib/react_on_rails/locales_to_js.rb +++ b/lib/react_on_rails/locales_to_js.rb @@ -5,7 +5,7 @@ module ReactOnRails class LocalesToJs def initialize - return unless i18n_dir.present? + return unless i18n_dir.directory? return unless obsolete? @translations, @defaults = generate_translations convert From 8728504e9537fe328ceecb782243a34d32f79e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Fri, 21 Jul 2017 10:22:44 +0200 Subject: [PATCH 02/30] added test for i18n_dir = nil and check for nil? --- lib/react_on_rails/locales_to_js.rb | 7 ++++- spec/react_on_rails/locales_to_js_spec.rb | 37 +++++++++++++++++++++++ spec/react_on_rails/spec/examples.txt | 9 ++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 spec/react_on_rails/spec/examples.txt diff --git a/lib/react_on_rails/locales_to_js.rb b/lib/react_on_rails/locales_to_js.rb index 0eef19876..90dd63067 100644 --- a/lib/react_on_rails/locales_to_js.rb +++ b/lib/react_on_rails/locales_to_js.rb @@ -5,7 +5,12 @@ module ReactOnRails class LocalesToJs def initialize - return unless i18n_dir.directory? + if i18n_dir.blank? + raise "i18n_dir missing, did you set i18n_dir in react_on_rails intializer?" + end + unless i18n_dir.directory? + raise "i18n_dir is not a directory did you set i18n_dir in react_on_rails intializer?" + end return unless obsolete? @translations, @defaults = generate_translations convert diff --git a/spec/react_on_rails/locales_to_js_spec.rb b/spec/react_on_rails/locales_to_js_spec.rb index 0003b9a11..2bde9c17a 100644 --- a/spec/react_on_rails/locales_to_js_spec.rb +++ b/spec/react_on_rails/locales_to_js_spec.rb @@ -9,6 +9,19 @@ module ReactOnRails let(:translations_path) { "#{i18n_dir}/translations.js" } let(:default_path) { "#{i18n_dir}/default.js" } + + + it "i18n_dir set to nil" do + ReactOnRails.configure do |config| + config.i18n_dir = nil + end + expect { ReactOnRails::LocalesToJs.new }.to raise_error("i18n_dir missing, did you set i18n_dir in react_on_rails intializer?") + end + + + + + shared_examples "locale to js" do context "with obsolete js files" do before do @@ -86,5 +99,29 @@ module ReactOnRails it_behaves_like "locale to js" end + + describe "with i18n_dir" do + let(:locale_dir) { File.expand_path("../fixtures/i18n/locales", __FILE__) } + let(:en_path) { "#{locale_dir}/en.yml" } + + before do + ReactOnRails.configure do |config| + config.i18n_dir = i18n_dir + config.i18n_yml_dir = locale_dir + end + end + + after do + ReactOnRails.configure do |config| + config.i18n_dir = nil + config.i18n_yml_dir = nil + end + end + + it_behaves_like "locale to js" + end + + + end end diff --git a/spec/react_on_rails/spec/examples.txt b/spec/react_on_rails/spec/examples.txt new file mode 100644 index 000000000..08b693556 --- /dev/null +++ b/spec/react_on_rails/spec/examples.txt @@ -0,0 +1,9 @@ +example_id | status | run_time | +---------------------------------- | ------ | --------------- | +./locales_to_js_spec.rb[1:1] | passed | 0.00113 seconds | +./locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.01047 seconds | +./locales_to_js_spec.rb[1:2:1:2:1] | failed | 0.00178 seconds | +./locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00224 seconds | +./locales_to_js_spec.rb[1:3:1:2:1] | failed | 0.00087 seconds | +./locales_to_js_spec.rb[1:4:1:1:1] | passed | 0.01074 seconds | +./locales_to_js_spec.rb[1:4:1:2:1] | failed | 0.00112 seconds | From fc261508f68ec71cee24d8ca59bfbb94eeb4f8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Fri, 21 Jul 2017 10:22:59 +0200 Subject: [PATCH 03/30] added test for i18n_dir = nil and check for nil? --- spec/react_on_rails/spec/examples.txt | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 spec/react_on_rails/spec/examples.txt diff --git a/spec/react_on_rails/spec/examples.txt b/spec/react_on_rails/spec/examples.txt deleted file mode 100644 index 08b693556..000000000 --- a/spec/react_on_rails/spec/examples.txt +++ /dev/null @@ -1,9 +0,0 @@ -example_id | status | run_time | ----------------------------------- | ------ | --------------- | -./locales_to_js_spec.rb[1:1] | passed | 0.00113 seconds | -./locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.01047 seconds | -./locales_to_js_spec.rb[1:2:1:2:1] | failed | 0.00178 seconds | -./locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00224 seconds | -./locales_to_js_spec.rb[1:3:1:2:1] | failed | 0.00087 seconds | -./locales_to_js_spec.rb[1:4:1:1:1] | passed | 0.01074 seconds | -./locales_to_js_spec.rb[1:4:1:2:1] | failed | 0.00112 seconds | From 3f2be58917dfab54552f4f5314a01b46a19da70f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Fri, 21 Jul 2017 10:24:11 +0200 Subject: [PATCH 04/30] added test for i18n_dir = nil and check for nil? --- spec/react_on_rails/locales_to_js_spec.rb | 24 ----------------------- 1 file changed, 24 deletions(-) diff --git a/spec/react_on_rails/locales_to_js_spec.rb b/spec/react_on_rails/locales_to_js_spec.rb index 2bde9c17a..d0ecffca0 100644 --- a/spec/react_on_rails/locales_to_js_spec.rb +++ b/spec/react_on_rails/locales_to_js_spec.rb @@ -99,29 +99,5 @@ module ReactOnRails it_behaves_like "locale to js" end - - describe "with i18n_dir" do - let(:locale_dir) { File.expand_path("../fixtures/i18n/locales", __FILE__) } - let(:en_path) { "#{locale_dir}/en.yml" } - - before do - ReactOnRails.configure do |config| - config.i18n_dir = i18n_dir - config.i18n_yml_dir = locale_dir - end - end - - after do - ReactOnRails.configure do |config| - config.i18n_dir = nil - config.i18n_yml_dir = nil - end - end - - it_behaves_like "locale to js" - end - - - end end From 217d13f78fb7de284ce3e1680a1e7efe17407abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Fri, 21 Jul 2017 10:30:36 +0200 Subject: [PATCH 05/30] added text to changelong.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d42288da2..ca465d5e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com] Changes since last non-beta release. *Please add entries here for your pull requests.* +- Changes check in locales_to_js to check for i18n_dir.blank? and i18n_dir.directory? - Fixes GitUtils.uncommitted_changes? throwing an error when called in an environment without Git, and allows install generator to be run successfully with `--ignore-warnings` [#878](https://github.com/shakacode/react_on_rails/pull/878) by [jasonblalock](https://github.com/jasonblalock) From 33eddf485e8722fe75d5945358cc007986668bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Sat, 22 Jul 2017 19:28:31 +0200 Subject: [PATCH 06/30] added test for i18n_dir = '' in addition to i18n_dir = nil, removed whitespaces, updated changelog --- CHANGELOG.md | 3 +-- lib/react_on_rails/locales_to_js.rb | 5 +---- spec/react_on_rails/locales_to_js_spec.rb | 19 ++++++++++--------- spec/spec/examples.txt | 13 +++++++++++++ 4 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 spec/spec/examples.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index ca465d5e2..25339a13f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,8 +11,7 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com] Changes since last non-beta release. *Please add entries here for your pull requests.* -- Changes check in locales_to_js to check for i18n_dir.blank? and i18n_dir.directory? - +- Fixes check for i18n_dir returning false when present in LocalesToJs. - Fixes GitUtils.uncommitted_changes? throwing an error when called in an environment without Git, and allows install generator to be run successfully with `--ignore-warnings` [#878](https://github.com/shakacode/react_on_rails/pull/878) by [jasonblalock](https://github.com/jasonblalock) ## [8.0.5] diff --git a/lib/react_on_rails/locales_to_js.rb b/lib/react_on_rails/locales_to_js.rb index 90dd63067..e16c9fdc1 100644 --- a/lib/react_on_rails/locales_to_js.rb +++ b/lib/react_on_rails/locales_to_js.rb @@ -5,10 +5,7 @@ module ReactOnRails class LocalesToJs def initialize - if i18n_dir.blank? - raise "i18n_dir missing, did you set i18n_dir in react_on_rails intializer?" - end - unless i18n_dir.directory? + unless File.directory?(i18n_dir.to_s) raise "i18n_dir is not a directory did you set i18n_dir in react_on_rails intializer?" end return unless obsolete? diff --git a/spec/react_on_rails/locales_to_js_spec.rb b/spec/react_on_rails/locales_to_js_spec.rb index d0ecffca0..a8ac03096 100644 --- a/spec/react_on_rails/locales_to_js_spec.rb +++ b/spec/react_on_rails/locales_to_js_spec.rb @@ -9,19 +9,20 @@ module ReactOnRails let(:translations_path) { "#{i18n_dir}/translations.js" } let(:default_path) { "#{i18n_dir}/default.js" } - - - it "i18n_dir set to nil" do + it "with i18n_dir set to ''" do + ReactOnRails.configure do |config| + config.i18n_dir = '' + end + expect { ReactOnRails::LocalesToJs.new }.to raise_error(/did you set i18n_dir in react_on_rails intializer?/) + end + + it "with i18n_dir set to nil" do ReactOnRails.configure do |config| config.i18n_dir = nil end - expect { ReactOnRails::LocalesToJs.new }.to raise_error("i18n_dir missing, did you set i18n_dir in react_on_rails intializer?") + expect { ReactOnRails::LocalesToJs.new }.to raise_error(/did you set i18n_dir in react_on_rails intializer?/) end - - - - - + shared_examples "locale to js" do context "with obsolete js files" do before do diff --git a/spec/spec/examples.txt b/spec/spec/examples.txt new file mode 100644 index 000000000..047bf2ab8 --- /dev/null +++ b/spec/spec/examples.txt @@ -0,0 +1,13 @@ +example_id | status | run_time | +------------------------------------------------- | ------ | --------------- | +./react_on_rails/configuration_spec.rb[1:1] | passed | 0.00122 seconds | +./react_on_rails/configuration_spec.rb[1:2] | passed | 0.00066 seconds | +./react_on_rails/configuration_spec.rb[1:3] | passed | 0.00016 seconds | +./react_on_rails/configuration_spec.rb[1:4] | passed | 0.00012 seconds | +./react_on_rails/configuration_spec.rb[1:5] | passed | 0.00013 seconds | +./react_on_rails/configuration_spec.rb[1:6] | passed | 0.0001 seconds | +./react_on_rails/locales_to_js_spec.rb[1:1] | passed | 0.00134 seconds | +./react_on_rails/locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.01067 seconds | +./react_on_rails/locales_to_js_spec.rb[1:2:1:2:1] | passed | 0.00181 seconds | +./react_on_rails/locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00201 seconds | +./react_on_rails/locales_to_js_spec.rb[1:3:1:2:1] | passed | 0.00175 seconds | From c459351587ace5be7c87b0f3dc753226e3d028fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Sat, 22 Jul 2017 19:28:51 +0200 Subject: [PATCH 07/30] removed examples.txt --- spec/spec/examples.txt | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 spec/spec/examples.txt diff --git a/spec/spec/examples.txt b/spec/spec/examples.txt deleted file mode 100644 index 047bf2ab8..000000000 --- a/spec/spec/examples.txt +++ /dev/null @@ -1,13 +0,0 @@ -example_id | status | run_time | -------------------------------------------------- | ------ | --------------- | -./react_on_rails/configuration_spec.rb[1:1] | passed | 0.00122 seconds | -./react_on_rails/configuration_spec.rb[1:2] | passed | 0.00066 seconds | -./react_on_rails/configuration_spec.rb[1:3] | passed | 0.00016 seconds | -./react_on_rails/configuration_spec.rb[1:4] | passed | 0.00012 seconds | -./react_on_rails/configuration_spec.rb[1:5] | passed | 0.00013 seconds | -./react_on_rails/configuration_spec.rb[1:6] | passed | 0.0001 seconds | -./react_on_rails/locales_to_js_spec.rb[1:1] | passed | 0.00134 seconds | -./react_on_rails/locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.01067 seconds | -./react_on_rails/locales_to_js_spec.rb[1:2:1:2:1] | passed | 0.00181 seconds | -./react_on_rails/locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00201 seconds | -./react_on_rails/locales_to_js_spec.rb[1:3:1:2:1] | passed | 0.00175 seconds | From f5cb8f025cb2aa14bf9ef2bde6a036da1fa6fbd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Sat, 5 Aug 2017 10:30:08 +0200 Subject: [PATCH 08/30] added changes as suggested --- lib/react_on_rails/locales_to_js.rb | 4 ++-- spec/react_on_rails/locales_to_js_spec.rb | 9 +-------- spec/spec/examples.txt | 7 +++++++ 3 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 spec/spec/examples.txt diff --git a/lib/react_on_rails/locales_to_js.rb b/lib/react_on_rails/locales_to_js.rb index e16c9fdc1..330cc4665 100644 --- a/lib/react_on_rails/locales_to_js.rb +++ b/lib/react_on_rails/locales_to_js.rb @@ -5,8 +5,8 @@ module ReactOnRails class LocalesToJs def initialize - unless File.directory?(i18n_dir.to_s) - raise "i18n_dir is not a directory did you set i18n_dir in react_on_rails intializer?" + if !i18n_dir.nil? && !File.directory?(i18n_dir) + raise "config.i18n_dir is set and it is not a directory. Did you set config.i18n_dir in the react_on_rails initializer?" end return unless obsolete? @translations, @defaults = generate_translations diff --git a/spec/react_on_rails/locales_to_js_spec.rb b/spec/react_on_rails/locales_to_js_spec.rb index a8ac03096..014c4333b 100644 --- a/spec/react_on_rails/locales_to_js_spec.rb +++ b/spec/react_on_rails/locales_to_js_spec.rb @@ -13,14 +13,7 @@ module ReactOnRails ReactOnRails.configure do |config| config.i18n_dir = '' end - expect { ReactOnRails::LocalesToJs.new }.to raise_error(/did you set i18n_dir in react_on_rails intializer?/) - end - - it "with i18n_dir set to nil" do - ReactOnRails.configure do |config| - config.i18n_dir = nil - end - expect { ReactOnRails::LocalesToJs.new }.to raise_error(/did you set i18n_dir in react_on_rails intializer?/) + expect { ReactOnRails::LocalesToJs.new }.to raise_error(/config.i18n_dir is set and it is not a directory. Did you set config.i18n_dir in the react_on_rails initializer?/) end shared_examples "locale to js" do diff --git a/spec/spec/examples.txt b/spec/spec/examples.txt new file mode 100644 index 000000000..a7829e51e --- /dev/null +++ b/spec/spec/examples.txt @@ -0,0 +1,7 @@ +example_id | status | run_time | +------------------------------------------------- | ------ | --------------- | +./react_on_rails/locales_to_js_spec.rb[1:1] | passed | 0.00158 seconds | +./react_on_rails/locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.01767 seconds | +./react_on_rails/locales_to_js_spec.rb[1:2:1:2:1] | passed | 0.00184 seconds | +./react_on_rails/locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00203 seconds | +./react_on_rails/locales_to_js_spec.rb[1:3:1:2:1] | passed | 0.00154 seconds | From 6d0ba7933aeddcabe42bc44fb81680b7a58cbb95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Sat, 5 Aug 2017 10:30:20 +0200 Subject: [PATCH 09/30] added changes as suggested --- spec/spec/examples.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 spec/spec/examples.txt diff --git a/spec/spec/examples.txt b/spec/spec/examples.txt deleted file mode 100644 index a7829e51e..000000000 --- a/spec/spec/examples.txt +++ /dev/null @@ -1,7 +0,0 @@ -example_id | status | run_time | -------------------------------------------------- | ------ | --------------- | -./react_on_rails/locales_to_js_spec.rb[1:1] | passed | 0.00158 seconds | -./react_on_rails/locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.01767 seconds | -./react_on_rails/locales_to_js_spec.rb[1:2:1:2:1] | passed | 0.00184 seconds | -./react_on_rails/locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00203 seconds | -./react_on_rails/locales_to_js_spec.rb[1:3:1:2:1] | passed | 0.00154 seconds | From 90243240da8386dfc0b805fedcf62c87936aab50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Fri, 11 Aug 2017 08:18:24 +0200 Subject: [PATCH 10/30] updated changelog.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25339a13f..2ad446d7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com] Changes since last non-beta release. *Please add entries here for your pull requests.* -- Fixes check for i18n_dir returning false when present in LocalesToJs. +- Fixes check for i18n_dir in LocalesToJs returning false when i18n_dir was set. - Fixes GitUtils.uncommitted_changes? throwing an error when called in an environment without Git, and allows install generator to be run successfully with `--ignore-warnings` [#878](https://github.com/shakacode/react_on_rails/pull/878) by [jasonblalock](https://github.com/jasonblalock) ## [8.0.5] From a5855ab432efabde2cc06129e09757e72869cdfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Fri, 11 Aug 2017 11:09:41 +0200 Subject: [PATCH 11/30] updated changelog.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ad446d7c..093567a73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com] Changes since last non-beta release. *Please add entries here for your pull requests.* -- Fixes check for i18n_dir in LocalesToJs returning false when i18n_dir was set. +- Fixes check for i18n_dir in LocalesToJs returning false when i18n_dir was set. [#899](https://github.com/shakacode/react_on_rails/pull/899) by [hakongit](https://github.com/hakongit) - Fixes GitUtils.uncommitted_changes? throwing an error when called in an environment without Git, and allows install generator to be run successfully with `--ignore-warnings` [#878](https://github.com/shakacode/react_on_rails/pull/878) by [jasonblalock](https://github.com/jasonblalock) ## [8.0.5] From 2b6267d3b910d63d57765274b4057dda109d167d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Tue, 29 Aug 2017 14:35:09 +0200 Subject: [PATCH 12/30] updated with check for i18n_yml_dir --- lib/react_on_rails/locales_to_js.rb | 1 + spec/spec/examples.txt | 171 ++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+) create mode 100644 spec/spec/examples.txt diff --git a/lib/react_on_rails/locales_to_js.rb b/lib/react_on_rails/locales_to_js.rb index 330cc4665..56d1faed3 100644 --- a/lib/react_on_rails/locales_to_js.rb +++ b/lib/react_on_rails/locales_to_js.rb @@ -8,6 +8,7 @@ def initialize if !i18n_dir.nil? && !File.directory?(i18n_dir) raise "config.i18n_dir is set and it is not a directory. Did you set config.i18n_dir in the react_on_rails initializer?" end + return if i18n_yml_dir.nil? return unless obsolete? @translations, @defaults = generate_translations convert diff --git a/spec/spec/examples.txt b/spec/spec/examples.txt new file mode 100644 index 000000000..5805e060f --- /dev/null +++ b/spec/spec/examples.txt @@ -0,0 +1,171 @@ +example_id | status | run_time | +--------------------------------------------------------------------------- | ------ | --------------- | +./react_on_rails/assets_precompile_spec.rb[1:1:1] | passed | 0.00667 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:2] | passed | 0.00182 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:3] | passed | 0.00073 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:4] | passed | 0.00079 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:5:1] | passed | 0.00191 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:6] | passed | 0.00081 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:7] | passed | 0.00088 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:8] | passed | 0.00132 seconds | +./react_on_rails/assets_precompile_spec.rb[1:2:1] | passed | 0.00123 seconds | +./react_on_rails/assets_precompile_spec.rb[1:2:2] | passed | 0.00308 seconds | +./react_on_rails/assets_precompile_spec.rb[1:2:3] | passed | 0.00142 seconds | +./react_on_rails/assets_precompile_spec.rb[1:3:1] | passed | 0.00308 seconds | +./react_on_rails/assets_precompile_spec.rb[1:4:1] | passed | 0.01492 seconds | +./react_on_rails/configuration_spec.rb[1:1] | passed | 0.00018 seconds | +./react_on_rails/configuration_spec.rb[1:2] | passed | 0.00014 seconds | +./react_on_rails/configuration_spec.rb[1:3] | passed | 0.00016 seconds | +./react_on_rails/configuration_spec.rb[1:4] | passed | 0.00017 seconds | +./react_on_rails/configuration_spec.rb[1:5] | passed | 0.00012 seconds | +./react_on_rails/configuration_spec.rb[1:6] | passed | 0.00012 seconds | +./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:1] | passed | 0.0002 seconds | +./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:2] | passed | 0.00017 seconds | +./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:3] | passed | 0.00019 seconds | +./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:4] | passed | 0.00021 seconds | +./react_on_rails/generators/dev_tests_generator_spec.rb[1:2:1] | passed | 0.00027 seconds | +./react_on_rails/generators/generator_messages_spec.rb[1:1] | passed | 0.0029 seconds | +./react_on_rails/generators/generator_messages_spec.rb[1:2] | passed | 0.00352 seconds | +./react_on_rails/generators/generator_messages_spec.rb[1:3] | passed | 0.0004 seconds | +./react_on_rails/generators/generator_messages_spec.rb[1:4] | passed | 0.00025 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:1] | passed | 0.00025 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:2] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:3] | passed | 0.00016 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:4] | passed | 0.00023 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:5] | passed | 0.00017 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:6] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:7] | passed | 0.0002 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:8] | passed | 0.00016 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:1] | passed | 0.00025 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:2] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:3] | passed | 0.00014 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:4] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:5] | passed | 0.00022 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:6] | passed | 0.0002 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:7] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:8] | passed | 0.00028 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:9] | passed | 0.00032 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:1] | passed | 0.00026 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:2] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:3] | passed | 0.00014 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:4] | passed | 0.00021 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:5] | passed | 0.00015 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:6] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:7] | passed | 0.00014 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:8] | passed | 0.0002 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:9] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:1] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:2] | passed | 0.00018 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:3] | passed | 0.00018 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:4] | passed | 0.0002 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:5] | passed | 0.00017 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:6] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:7] | passed | 0.00012 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:1] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:2] | passed | 0.00014 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:3] | passed | 0.00014 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:4] | passed | 0.00016 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:5] | passed | 0.00012 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:6] | passed | 0.00012 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:7] | passed | 0.00012 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:6:1] | passed | 0.00025 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:6:2] | passed | 0.00029 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:6:3] | passed | 0.00013 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:6:4] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:6:5] | passed | 0.00017 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:6:6] | passed | 0.00017 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:7:1] | passed | 0.00027 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:7:2] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:7:3] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:7:4] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:7:5] | passed | 0.00042 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:7:6] | passed | 0.00025 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:8:1] | passed | 0.00027 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:9:1] | passed | 0.0397 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:10:1] | passed | 0.03735 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:10:2] | passed | 0.04064 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:11:1] | passed | 0.00056 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:11:2] | passed | 0.00025 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:12:1] | passed | 0.00031 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:12:2] | passed | 0.00033 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:13:1] | passed | 0.00026 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:13:2] | passed | 0.00028 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:14:1] | passed | 0.00031 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:14:2] | passed | 0.00033 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:15:1] | passed | 0.04101 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:15:2] | passed | 0.041 seconds | +./react_on_rails/generators/version_syntax_converter_spec.rb[1:1:1:1] | passed | 0.00021 seconds | +./react_on_rails/generators/version_syntax_converter_spec.rb[1:1:2:1] | passed | 0.00015 seconds | +./react_on_rails/generators/version_syntax_converter_spec.rb[1:2:1:1] | passed | 0.00014 seconds | +./react_on_rails/generators/version_syntax_converter_spec.rb[1:2:2:1] | passed | 0.00017 seconds | +./react_on_rails/generators/version_syntax_converter_spec.rb[1:2:3:1] | passed | 0.00014 seconds | +./react_on_rails/git_utils_spec.rb[1:1:1:1] | passed | 0.00158 seconds | +./react_on_rails/git_utils_spec.rb[1:1:2:1] | passed | 0.00074 seconds | +./react_on_rails/git_utils_spec.rb[1:1:3:1] | passed | 0.00074 seconds | +./react_on_rails/json_output_spec.rb[1:1:1:1:1] | passed | 0.00061 seconds | +./react_on_rails/json_output_spec.rb[1:1:2:1:1] | passed | 0.00046 seconds | +./react_on_rails/json_output_spec.rb[1:2:1:1] | passed | 0.00028 seconds | +./react_on_rails/locales_to_js_spec.rb[1:1] | passed | 0.00035 seconds | +./react_on_rails/locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.00482 seconds | +./react_on_rails/locales_to_js_spec.rb[1:2:1:2:1] | passed | 0.00209 seconds | +./react_on_rails/locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00172 seconds | +./react_on_rails/locales_to_js_spec.rb[1:3:1:2:1] | passed | 0.0014 seconds | +./react_on_rails/react_component/options_spec.rb[1:1] | passed | 0.00016 seconds | +./react_on_rails/react_component/options_spec.rb[1:2:1:1] | passed | 0.00009 seconds | +./react_on_rails/react_component/options_spec.rb[1:2:2:1] | passed | 0.0001 seconds | +./react_on_rails/react_component/options_spec.rb[1:3:1] | passed | 0.00015 seconds | +./react_on_rails/react_component/options_spec.rb[1:4:1:1] | passed | 0.00035 seconds | +./react_on_rails/react_component/options_spec.rb[1:4:1:2] | passed | 0.00033 seconds | +./react_on_rails/react_component/options_spec.rb[1:4:2:1] | passed | 0.00013 seconds | +./react_on_rails/react_component/options_spec.rb[1:5:1:1] | passed | 0.00008 seconds | +./react_on_rails/react_component/options_spec.rb[1:5:2:1] | passed | 0.00007 seconds | +./react_on_rails/react_component/options_spec.rb[1:6:1:1] | passed | 0.0001 seconds | +./react_on_rails/react_component/options_spec.rb[1:6:2:1] | passed | 0.00016 seconds | +./react_on_rails/react_component/options_spec.rb[1:7:1:1] | passed | 0.00012 seconds | +./react_on_rails/react_component/options_spec.rb[1:7:2:1] | passed | 0.00013 seconds | +./react_on_rails/react_component/options_spec.rb[1:8:1:1] | passed | 0.00011 seconds | +./react_on_rails/react_component/options_spec.rb[1:8:2:1] | passed | 0.0001 seconds | +./react_on_rails/react_component/options_spec.rb[1:9:1:1] | passed | 0.00011 seconds | +./react_on_rails/react_component/options_spec.rb[1:9:2:1] | passed | 0.0001 seconds | +./react_on_rails/react_on_rails_spec.rb[1:1] | passed | 0.00007 seconds | +./react_on_rails/test_helper/ensure_assets_compiled_spec.rb[1:1:1:1] | passed | 0.0005 seconds | +./react_on_rails/test_helper/ensure_assets_compiled_spec.rb[1:1:2:1] | passed | 0.00031 seconds | +./react_on_rails/test_helper/webpack_assets_compiler_spec.rb[1:1:1:1] | passed | 0.00697 seconds | +./react_on_rails/test_helper/webpack_assets_compiler_spec.rb[1:1:1:2] | passed | 0.00822 seconds | +./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:1:1] | passed | 0.42377 seconds | +./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:2:1] | passed | 0.01223 seconds | +./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:3:1] | passed | 0.00078 seconds | +./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:4:1] | passed | 0.00069 seconds | +./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:5:1] | passed | 0.00766 seconds | +./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:6:1] | passed | 0.00713 seconds | +./react_on_rails/utils_spec.rb[1:1:1] | passed | 0.00031 seconds | +./react_on_rails/utils_spec.rb[1:2:1:1] | passed | 0.00012 seconds | +./react_on_rails/utils_spec.rb[1:2:2:1] | passed | 0.00017 seconds | +./react_on_rails/utils_spec.rb[1:2:3:1] | passed | 0.00009 seconds | +./react_on_rails/utils_spec.rb[1:2:4:1] | passed | 0.00027 seconds | +./react_on_rails/utils_spec.rb[1:2:5:1] | passed | 0.00037 seconds | +./react_on_rails/utils_spec.rb[1:3:1:1:1] | passed | 0.00038 seconds | +./react_on_rails/utils_spec.rb[1:3:1:2:1] | passed | 0.00028 seconds | +./react_on_rails/utils_spec.rb[1:3:1:3:1] | passed | 0.00023 seconds | +./react_on_rails/utils_spec.rb[1:3:1:4:1] | passed | 0.00025 seconds | +./react_on_rails/utils_spec.rb[1:3:1:5:1] | passed | 0.00027 seconds | +./react_on_rails/utils_spec.rb[1:3:1:6:1] | passed | 0.00238 seconds | +./react_on_rails/utils_spec.rb[1:3:2:1:1] | passed | 0.00058 seconds | +./react_on_rails/utils_spec.rb[1:3:2:2:1] | passed | 0.00051 seconds | +./react_on_rails/version_checker_spec.rb[1:1:1:1] | passed | 0.00068 seconds | +./react_on_rails/version_checker_spec.rb[1:1:2:1] | passed | 0.00054 seconds | +./react_on_rails/version_checker_spec.rb[1:1:3:1] | passed | 0.00037 seconds | +./react_on_rails/version_checker_spec.rb[1:1:4:1] | passed | 0.00083 seconds | +./react_on_rails/version_checker_spec.rb[1:1:5:1] | passed | 0.00085 seconds | +./react_on_rails/version_checker_spec.rb[1:2:1:1:1] | passed | 0.00023 seconds | +./react_on_rails/version_checker_spec.rb[1:2:1:2:1] | passed | 0.00024 seconds | +./react_on_rails/version_checker_spec.rb[1:2:1:3:1] | passed | 0.00021 seconds | +./react_on_rails/version_checker_spec.rb[1:2:2:1:1] | passed | 0.00015 seconds | +./react_on_rails/version_checker_spec.rb[1:2:2:2:1] | passed | 0.00022 seconds | +./react_on_rails/version_checker_spec.rb[1:2:2:3:1] | passed | 0.00019 seconds | +./react_on_rails/version_checker_spec.rb[1:2:3:1:1] | passed | 0.00018 seconds | +./react_on_rails/version_checker_spec.rb[1:2:3:2:1] | passed | 0.0002 seconds | +./react_on_rails/version_checker_spec.rb[1:2:3:3:1] | passed | 0.00014 seconds | +./react_on_rails/version_checker_spec.rb[1:2:4:1:1] | passed | 0.00016 seconds | +./react_on_rails/version_checker_spec.rb[1:2:4:2:1] | passed | 0.00027 seconds | +./react_on_rails/version_checker_spec.rb[1:2:4:3:1] | passed | 0.00014 seconds | From 05d95073bfb085ffdd9b2353062e27cc12529432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Tue, 29 Aug 2017 14:35:16 +0200 Subject: [PATCH 13/30] updated with check for i18n_yml_dir --- spec/spec/examples.txt | 171 ----------------------------------------- 1 file changed, 171 deletions(-) delete mode 100644 spec/spec/examples.txt diff --git a/spec/spec/examples.txt b/spec/spec/examples.txt deleted file mode 100644 index 5805e060f..000000000 --- a/spec/spec/examples.txt +++ /dev/null @@ -1,171 +0,0 @@ -example_id | status | run_time | ---------------------------------------------------------------------------- | ------ | --------------- | -./react_on_rails/assets_precompile_spec.rb[1:1:1] | passed | 0.00667 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:2] | passed | 0.00182 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:3] | passed | 0.00073 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:4] | passed | 0.00079 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:5:1] | passed | 0.00191 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:6] | passed | 0.00081 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:7] | passed | 0.00088 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:8] | passed | 0.00132 seconds | -./react_on_rails/assets_precompile_spec.rb[1:2:1] | passed | 0.00123 seconds | -./react_on_rails/assets_precompile_spec.rb[1:2:2] | passed | 0.00308 seconds | -./react_on_rails/assets_precompile_spec.rb[1:2:3] | passed | 0.00142 seconds | -./react_on_rails/assets_precompile_spec.rb[1:3:1] | passed | 0.00308 seconds | -./react_on_rails/assets_precompile_spec.rb[1:4:1] | passed | 0.01492 seconds | -./react_on_rails/configuration_spec.rb[1:1] | passed | 0.00018 seconds | -./react_on_rails/configuration_spec.rb[1:2] | passed | 0.00014 seconds | -./react_on_rails/configuration_spec.rb[1:3] | passed | 0.00016 seconds | -./react_on_rails/configuration_spec.rb[1:4] | passed | 0.00017 seconds | -./react_on_rails/configuration_spec.rb[1:5] | passed | 0.00012 seconds | -./react_on_rails/configuration_spec.rb[1:6] | passed | 0.00012 seconds | -./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:1] | passed | 0.0002 seconds | -./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:2] | passed | 0.00017 seconds | -./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:3] | passed | 0.00019 seconds | -./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:4] | passed | 0.00021 seconds | -./react_on_rails/generators/dev_tests_generator_spec.rb[1:2:1] | passed | 0.00027 seconds | -./react_on_rails/generators/generator_messages_spec.rb[1:1] | passed | 0.0029 seconds | -./react_on_rails/generators/generator_messages_spec.rb[1:2] | passed | 0.00352 seconds | -./react_on_rails/generators/generator_messages_spec.rb[1:3] | passed | 0.0004 seconds | -./react_on_rails/generators/generator_messages_spec.rb[1:4] | passed | 0.00025 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:1] | passed | 0.00025 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:2] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:3] | passed | 0.00016 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:4] | passed | 0.00023 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:5] | passed | 0.00017 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:6] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:7] | passed | 0.0002 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:8] | passed | 0.00016 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:1] | passed | 0.00025 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:2] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:3] | passed | 0.00014 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:4] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:5] | passed | 0.00022 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:6] | passed | 0.0002 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:7] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:8] | passed | 0.00028 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:9] | passed | 0.00032 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:1] | passed | 0.00026 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:2] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:3] | passed | 0.00014 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:4] | passed | 0.00021 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:5] | passed | 0.00015 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:6] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:7] | passed | 0.00014 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:8] | passed | 0.0002 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:9] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:1] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:2] | passed | 0.00018 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:3] | passed | 0.00018 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:4] | passed | 0.0002 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:5] | passed | 0.00017 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:6] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:7] | passed | 0.00012 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:1] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:2] | passed | 0.00014 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:3] | passed | 0.00014 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:4] | passed | 0.00016 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:5] | passed | 0.00012 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:6] | passed | 0.00012 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:7] | passed | 0.00012 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:6:1] | passed | 0.00025 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:6:2] | passed | 0.00029 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:6:3] | passed | 0.00013 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:6:4] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:6:5] | passed | 0.00017 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:6:6] | passed | 0.00017 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:7:1] | passed | 0.00027 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:7:2] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:7:3] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:7:4] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:7:5] | passed | 0.00042 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:7:6] | passed | 0.00025 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:8:1] | passed | 0.00027 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:9:1] | passed | 0.0397 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:10:1] | passed | 0.03735 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:10:2] | passed | 0.04064 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:11:1] | passed | 0.00056 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:11:2] | passed | 0.00025 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:12:1] | passed | 0.00031 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:12:2] | passed | 0.00033 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:13:1] | passed | 0.00026 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:13:2] | passed | 0.00028 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:14:1] | passed | 0.00031 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:14:2] | passed | 0.00033 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:15:1] | passed | 0.04101 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:15:2] | passed | 0.041 seconds | -./react_on_rails/generators/version_syntax_converter_spec.rb[1:1:1:1] | passed | 0.00021 seconds | -./react_on_rails/generators/version_syntax_converter_spec.rb[1:1:2:1] | passed | 0.00015 seconds | -./react_on_rails/generators/version_syntax_converter_spec.rb[1:2:1:1] | passed | 0.00014 seconds | -./react_on_rails/generators/version_syntax_converter_spec.rb[1:2:2:1] | passed | 0.00017 seconds | -./react_on_rails/generators/version_syntax_converter_spec.rb[1:2:3:1] | passed | 0.00014 seconds | -./react_on_rails/git_utils_spec.rb[1:1:1:1] | passed | 0.00158 seconds | -./react_on_rails/git_utils_spec.rb[1:1:2:1] | passed | 0.00074 seconds | -./react_on_rails/git_utils_spec.rb[1:1:3:1] | passed | 0.00074 seconds | -./react_on_rails/json_output_spec.rb[1:1:1:1:1] | passed | 0.00061 seconds | -./react_on_rails/json_output_spec.rb[1:1:2:1:1] | passed | 0.00046 seconds | -./react_on_rails/json_output_spec.rb[1:2:1:1] | passed | 0.00028 seconds | -./react_on_rails/locales_to_js_spec.rb[1:1] | passed | 0.00035 seconds | -./react_on_rails/locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.00482 seconds | -./react_on_rails/locales_to_js_spec.rb[1:2:1:2:1] | passed | 0.00209 seconds | -./react_on_rails/locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00172 seconds | -./react_on_rails/locales_to_js_spec.rb[1:3:1:2:1] | passed | 0.0014 seconds | -./react_on_rails/react_component/options_spec.rb[1:1] | passed | 0.00016 seconds | -./react_on_rails/react_component/options_spec.rb[1:2:1:1] | passed | 0.00009 seconds | -./react_on_rails/react_component/options_spec.rb[1:2:2:1] | passed | 0.0001 seconds | -./react_on_rails/react_component/options_spec.rb[1:3:1] | passed | 0.00015 seconds | -./react_on_rails/react_component/options_spec.rb[1:4:1:1] | passed | 0.00035 seconds | -./react_on_rails/react_component/options_spec.rb[1:4:1:2] | passed | 0.00033 seconds | -./react_on_rails/react_component/options_spec.rb[1:4:2:1] | passed | 0.00013 seconds | -./react_on_rails/react_component/options_spec.rb[1:5:1:1] | passed | 0.00008 seconds | -./react_on_rails/react_component/options_spec.rb[1:5:2:1] | passed | 0.00007 seconds | -./react_on_rails/react_component/options_spec.rb[1:6:1:1] | passed | 0.0001 seconds | -./react_on_rails/react_component/options_spec.rb[1:6:2:1] | passed | 0.00016 seconds | -./react_on_rails/react_component/options_spec.rb[1:7:1:1] | passed | 0.00012 seconds | -./react_on_rails/react_component/options_spec.rb[1:7:2:1] | passed | 0.00013 seconds | -./react_on_rails/react_component/options_spec.rb[1:8:1:1] | passed | 0.00011 seconds | -./react_on_rails/react_component/options_spec.rb[1:8:2:1] | passed | 0.0001 seconds | -./react_on_rails/react_component/options_spec.rb[1:9:1:1] | passed | 0.00011 seconds | -./react_on_rails/react_component/options_spec.rb[1:9:2:1] | passed | 0.0001 seconds | -./react_on_rails/react_on_rails_spec.rb[1:1] | passed | 0.00007 seconds | -./react_on_rails/test_helper/ensure_assets_compiled_spec.rb[1:1:1:1] | passed | 0.0005 seconds | -./react_on_rails/test_helper/ensure_assets_compiled_spec.rb[1:1:2:1] | passed | 0.00031 seconds | -./react_on_rails/test_helper/webpack_assets_compiler_spec.rb[1:1:1:1] | passed | 0.00697 seconds | -./react_on_rails/test_helper/webpack_assets_compiler_spec.rb[1:1:1:2] | passed | 0.00822 seconds | -./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:1:1] | passed | 0.42377 seconds | -./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:2:1] | passed | 0.01223 seconds | -./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:3:1] | passed | 0.00078 seconds | -./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:4:1] | passed | 0.00069 seconds | -./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:5:1] | passed | 0.00766 seconds | -./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:6:1] | passed | 0.00713 seconds | -./react_on_rails/utils_spec.rb[1:1:1] | passed | 0.00031 seconds | -./react_on_rails/utils_spec.rb[1:2:1:1] | passed | 0.00012 seconds | -./react_on_rails/utils_spec.rb[1:2:2:1] | passed | 0.00017 seconds | -./react_on_rails/utils_spec.rb[1:2:3:1] | passed | 0.00009 seconds | -./react_on_rails/utils_spec.rb[1:2:4:1] | passed | 0.00027 seconds | -./react_on_rails/utils_spec.rb[1:2:5:1] | passed | 0.00037 seconds | -./react_on_rails/utils_spec.rb[1:3:1:1:1] | passed | 0.00038 seconds | -./react_on_rails/utils_spec.rb[1:3:1:2:1] | passed | 0.00028 seconds | -./react_on_rails/utils_spec.rb[1:3:1:3:1] | passed | 0.00023 seconds | -./react_on_rails/utils_spec.rb[1:3:1:4:1] | passed | 0.00025 seconds | -./react_on_rails/utils_spec.rb[1:3:1:5:1] | passed | 0.00027 seconds | -./react_on_rails/utils_spec.rb[1:3:1:6:1] | passed | 0.00238 seconds | -./react_on_rails/utils_spec.rb[1:3:2:1:1] | passed | 0.00058 seconds | -./react_on_rails/utils_spec.rb[1:3:2:2:1] | passed | 0.00051 seconds | -./react_on_rails/version_checker_spec.rb[1:1:1:1] | passed | 0.00068 seconds | -./react_on_rails/version_checker_spec.rb[1:1:2:1] | passed | 0.00054 seconds | -./react_on_rails/version_checker_spec.rb[1:1:3:1] | passed | 0.00037 seconds | -./react_on_rails/version_checker_spec.rb[1:1:4:1] | passed | 0.00083 seconds | -./react_on_rails/version_checker_spec.rb[1:1:5:1] | passed | 0.00085 seconds | -./react_on_rails/version_checker_spec.rb[1:2:1:1:1] | passed | 0.00023 seconds | -./react_on_rails/version_checker_spec.rb[1:2:1:2:1] | passed | 0.00024 seconds | -./react_on_rails/version_checker_spec.rb[1:2:1:3:1] | passed | 0.00021 seconds | -./react_on_rails/version_checker_spec.rb[1:2:2:1:1] | passed | 0.00015 seconds | -./react_on_rails/version_checker_spec.rb[1:2:2:2:1] | passed | 0.00022 seconds | -./react_on_rails/version_checker_spec.rb[1:2:2:3:1] | passed | 0.00019 seconds | -./react_on_rails/version_checker_spec.rb[1:2:3:1:1] | passed | 0.00018 seconds | -./react_on_rails/version_checker_spec.rb[1:2:3:2:1] | passed | 0.0002 seconds | -./react_on_rails/version_checker_spec.rb[1:2:3:3:1] | passed | 0.00014 seconds | -./react_on_rails/version_checker_spec.rb[1:2:4:1:1] | passed | 0.00016 seconds | -./react_on_rails/version_checker_spec.rb[1:2:4:2:1] | passed | 0.00027 seconds | -./react_on_rails/version_checker_spec.rb[1:2:4:3:1] | passed | 0.00014 seconds | From 665a01963bcf0ef025f9122fe134215bdcabe879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Tue, 18 Jul 2017 14:23:14 +0200 Subject: [PATCH 14/30] change i18n directory check --- lib/react_on_rails/locales_to_js.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/react_on_rails/locales_to_js.rb b/lib/react_on_rails/locales_to_js.rb index d2da631ca..0eef19876 100644 --- a/lib/react_on_rails/locales_to_js.rb +++ b/lib/react_on_rails/locales_to_js.rb @@ -5,7 +5,7 @@ module ReactOnRails class LocalesToJs def initialize - return if i18n_dir.blank? + return unless i18n_dir.directory? return unless obsolete? @translations, @defaults = generate_translations convert From 896c539f26b57a71c1aecfa89e87d73d9217d54c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Fri, 21 Jul 2017 10:22:44 +0200 Subject: [PATCH 15/30] added test for i18n_dir = nil and check for nil? --- lib/react_on_rails/locales_to_js.rb | 7 ++++- spec/react_on_rails/locales_to_js_spec.rb | 37 +++++++++++++++++++++++ spec/react_on_rails/spec/examples.txt | 9 ++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 spec/react_on_rails/spec/examples.txt diff --git a/lib/react_on_rails/locales_to_js.rb b/lib/react_on_rails/locales_to_js.rb index 0eef19876..90dd63067 100644 --- a/lib/react_on_rails/locales_to_js.rb +++ b/lib/react_on_rails/locales_to_js.rb @@ -5,7 +5,12 @@ module ReactOnRails class LocalesToJs def initialize - return unless i18n_dir.directory? + if i18n_dir.blank? + raise "i18n_dir missing, did you set i18n_dir in react_on_rails intializer?" + end + unless i18n_dir.directory? + raise "i18n_dir is not a directory did you set i18n_dir in react_on_rails intializer?" + end return unless obsolete? @translations, @defaults = generate_translations convert diff --git a/spec/react_on_rails/locales_to_js_spec.rb b/spec/react_on_rails/locales_to_js_spec.rb index 159caad57..20f507e69 100644 --- a/spec/react_on_rails/locales_to_js_spec.rb +++ b/spec/react_on_rails/locales_to_js_spec.rb @@ -9,6 +9,19 @@ module ReactOnRails let(:translations_path) { "#{i18n_dir}/translations.js" } let(:default_path) { "#{i18n_dir}/default.js" } + + + it "i18n_dir set to nil" do + ReactOnRails.configure do |config| + config.i18n_dir = nil + end + expect { ReactOnRails::LocalesToJs.new }.to raise_error("i18n_dir missing, did you set i18n_dir in react_on_rails intializer?") + end + + + + + shared_examples "locale to js" do context "with obsolete js files" do before do @@ -86,5 +99,29 @@ module ReactOnRails it_behaves_like "locale to js" end + + describe "with i18n_dir" do + let(:locale_dir) { File.expand_path("../fixtures/i18n/locales", __FILE__) } + let(:en_path) { "#{locale_dir}/en.yml" } + + before do + ReactOnRails.configure do |config| + config.i18n_dir = i18n_dir + config.i18n_yml_dir = locale_dir + end + end + + after do + ReactOnRails.configure do |config| + config.i18n_dir = nil + config.i18n_yml_dir = nil + end + end + + it_behaves_like "locale to js" + end + + + end end diff --git a/spec/react_on_rails/spec/examples.txt b/spec/react_on_rails/spec/examples.txt new file mode 100644 index 000000000..08b693556 --- /dev/null +++ b/spec/react_on_rails/spec/examples.txt @@ -0,0 +1,9 @@ +example_id | status | run_time | +---------------------------------- | ------ | --------------- | +./locales_to_js_spec.rb[1:1] | passed | 0.00113 seconds | +./locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.01047 seconds | +./locales_to_js_spec.rb[1:2:1:2:1] | failed | 0.00178 seconds | +./locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00224 seconds | +./locales_to_js_spec.rb[1:3:1:2:1] | failed | 0.00087 seconds | +./locales_to_js_spec.rb[1:4:1:1:1] | passed | 0.01074 seconds | +./locales_to_js_spec.rb[1:4:1:2:1] | failed | 0.00112 seconds | From 746bb80ad4ce5d848f26cb68ab63b8e849bf7c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Fri, 21 Jul 2017 10:22:59 +0200 Subject: [PATCH 16/30] added test for i18n_dir = nil and check for nil? --- spec/react_on_rails/spec/examples.txt | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 spec/react_on_rails/spec/examples.txt diff --git a/spec/react_on_rails/spec/examples.txt b/spec/react_on_rails/spec/examples.txt deleted file mode 100644 index 08b693556..000000000 --- a/spec/react_on_rails/spec/examples.txt +++ /dev/null @@ -1,9 +0,0 @@ -example_id | status | run_time | ----------------------------------- | ------ | --------------- | -./locales_to_js_spec.rb[1:1] | passed | 0.00113 seconds | -./locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.01047 seconds | -./locales_to_js_spec.rb[1:2:1:2:1] | failed | 0.00178 seconds | -./locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00224 seconds | -./locales_to_js_spec.rb[1:3:1:2:1] | failed | 0.00087 seconds | -./locales_to_js_spec.rb[1:4:1:1:1] | passed | 0.01074 seconds | -./locales_to_js_spec.rb[1:4:1:2:1] | failed | 0.00112 seconds | From 05b5549ba51dd5c0ab6ecda7723bd2439560220a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Fri, 21 Jul 2017 10:24:11 +0200 Subject: [PATCH 17/30] added test for i18n_dir = nil and check for nil? --- spec/react_on_rails/locales_to_js_spec.rb | 24 ----------------------- 1 file changed, 24 deletions(-) diff --git a/spec/react_on_rails/locales_to_js_spec.rb b/spec/react_on_rails/locales_to_js_spec.rb index 20f507e69..8e68d5dae 100644 --- a/spec/react_on_rails/locales_to_js_spec.rb +++ b/spec/react_on_rails/locales_to_js_spec.rb @@ -99,29 +99,5 @@ module ReactOnRails it_behaves_like "locale to js" end - - describe "with i18n_dir" do - let(:locale_dir) { File.expand_path("../fixtures/i18n/locales", __FILE__) } - let(:en_path) { "#{locale_dir}/en.yml" } - - before do - ReactOnRails.configure do |config| - config.i18n_dir = i18n_dir - config.i18n_yml_dir = locale_dir - end - end - - after do - ReactOnRails.configure do |config| - config.i18n_dir = nil - config.i18n_yml_dir = nil - end - end - - it_behaves_like "locale to js" - end - - - end end From 7ceb17134968f9ed0f2b0304bb0856ed5a756074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Fri, 21 Jul 2017 10:30:36 +0200 Subject: [PATCH 18/30] added text to changelong.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 804c36a39..3b9556959 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ Changes since last non-beta release. - Fixed `react_component_hash` functionality in cases of prerendering errors: [PR 960](https://github.com/shakacode/react_on_rails/pull/960) by [Judahmeek](https://github.com/Judahmeek) *Please add entries here for your pull requests.* +- Changes check in locales_to_js to check for i18n_dir.blank? and i18n_dir.directory? ### [10.0.0] - 2017-10-08 #### Created From 15ea2107ada704a5a1b1661ca7e3817ab1d87493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Sat, 22 Jul 2017 19:28:31 +0200 Subject: [PATCH 19/30] added test for i18n_dir = '' in addition to i18n_dir = nil, removed whitespaces, updated changelog --- CHANGELOG.md | 4 ++++ lib/react_on_rails/locales_to_js.rb | 5 +---- spec/react_on_rails/locales_to_js_spec.rb | 19 ++++++++++--------- spec/spec/examples.txt | 13 +++++++++++++ 4 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 spec/spec/examples.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b9556959..f06f3f463 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ Changes since last non-beta release. - Fixed `react_component_hash` functionality in cases of prerendering errors: [PR 960](https://github.com/shakacode/react_on_rails/pull/960) by [Judahmeek](https://github.com/Judahmeek) *Please add entries here for your pull requests.* +<<<<<<< HEAD - Changes check in locales_to_js to check for i18n_dir.blank? and i18n_dir.directory? ### [10.0.0] - 2017-10-08 @@ -52,6 +53,9 @@ For an example of upgrading, see [react-webpack-rails-tutorial/pull/416](https:/ ```rb gem "webpacker" ``` +======= +- Fixes check for i18n_dir returning false when present in LocalesToJs. +- Fixes GitUtils.uncommitted_changes? throwing an error when called in an environment without Git, and allows install generator to be run successfully with `--ignore-warnings` [#878](https://github.com/shakacode/react_on_rails/pull/878) by [jasonblalock](https://github.com/jasonblalock) - Update for the renaming in the `WebpackConfigLoader` in your webpack configuration. You will need to rename the following object properties: diff --git a/lib/react_on_rails/locales_to_js.rb b/lib/react_on_rails/locales_to_js.rb index 90dd63067..e16c9fdc1 100644 --- a/lib/react_on_rails/locales_to_js.rb +++ b/lib/react_on_rails/locales_to_js.rb @@ -5,10 +5,7 @@ module ReactOnRails class LocalesToJs def initialize - if i18n_dir.blank? - raise "i18n_dir missing, did you set i18n_dir in react_on_rails intializer?" - end - unless i18n_dir.directory? + unless File.directory?(i18n_dir.to_s) raise "i18n_dir is not a directory did you set i18n_dir in react_on_rails intializer?" end return unless obsolete? diff --git a/spec/react_on_rails/locales_to_js_spec.rb b/spec/react_on_rails/locales_to_js_spec.rb index 8e68d5dae..68b2bb9da 100644 --- a/spec/react_on_rails/locales_to_js_spec.rb +++ b/spec/react_on_rails/locales_to_js_spec.rb @@ -9,19 +9,20 @@ module ReactOnRails let(:translations_path) { "#{i18n_dir}/translations.js" } let(:default_path) { "#{i18n_dir}/default.js" } - - - it "i18n_dir set to nil" do + it "with i18n_dir set to ''" do + ReactOnRails.configure do |config| + config.i18n_dir = '' + end + expect { ReactOnRails::LocalesToJs.new }.to raise_error(/did you set i18n_dir in react_on_rails intializer?/) + end + + it "with i18n_dir set to nil" do ReactOnRails.configure do |config| config.i18n_dir = nil end - expect { ReactOnRails::LocalesToJs.new }.to raise_error("i18n_dir missing, did you set i18n_dir in react_on_rails intializer?") + expect { ReactOnRails::LocalesToJs.new }.to raise_error(/did you set i18n_dir in react_on_rails intializer?/) end - - - - - + shared_examples "locale to js" do context "with obsolete js files" do before do diff --git a/spec/spec/examples.txt b/spec/spec/examples.txt new file mode 100644 index 000000000..047bf2ab8 --- /dev/null +++ b/spec/spec/examples.txt @@ -0,0 +1,13 @@ +example_id | status | run_time | +------------------------------------------------- | ------ | --------------- | +./react_on_rails/configuration_spec.rb[1:1] | passed | 0.00122 seconds | +./react_on_rails/configuration_spec.rb[1:2] | passed | 0.00066 seconds | +./react_on_rails/configuration_spec.rb[1:3] | passed | 0.00016 seconds | +./react_on_rails/configuration_spec.rb[1:4] | passed | 0.00012 seconds | +./react_on_rails/configuration_spec.rb[1:5] | passed | 0.00013 seconds | +./react_on_rails/configuration_spec.rb[1:6] | passed | 0.0001 seconds | +./react_on_rails/locales_to_js_spec.rb[1:1] | passed | 0.00134 seconds | +./react_on_rails/locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.01067 seconds | +./react_on_rails/locales_to_js_spec.rb[1:2:1:2:1] | passed | 0.00181 seconds | +./react_on_rails/locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00201 seconds | +./react_on_rails/locales_to_js_spec.rb[1:3:1:2:1] | passed | 0.00175 seconds | From a42ceabbf1e5c14f53331aef3ec6d3259fc9f9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Sat, 22 Jul 2017 19:28:51 +0200 Subject: [PATCH 20/30] removed examples.txt --- spec/spec/examples.txt | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 spec/spec/examples.txt diff --git a/spec/spec/examples.txt b/spec/spec/examples.txt deleted file mode 100644 index 047bf2ab8..000000000 --- a/spec/spec/examples.txt +++ /dev/null @@ -1,13 +0,0 @@ -example_id | status | run_time | -------------------------------------------------- | ------ | --------------- | -./react_on_rails/configuration_spec.rb[1:1] | passed | 0.00122 seconds | -./react_on_rails/configuration_spec.rb[1:2] | passed | 0.00066 seconds | -./react_on_rails/configuration_spec.rb[1:3] | passed | 0.00016 seconds | -./react_on_rails/configuration_spec.rb[1:4] | passed | 0.00012 seconds | -./react_on_rails/configuration_spec.rb[1:5] | passed | 0.00013 seconds | -./react_on_rails/configuration_spec.rb[1:6] | passed | 0.0001 seconds | -./react_on_rails/locales_to_js_spec.rb[1:1] | passed | 0.00134 seconds | -./react_on_rails/locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.01067 seconds | -./react_on_rails/locales_to_js_spec.rb[1:2:1:2:1] | passed | 0.00181 seconds | -./react_on_rails/locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00201 seconds | -./react_on_rails/locales_to_js_spec.rb[1:3:1:2:1] | passed | 0.00175 seconds | From 445e1ed61387048ed469202198eb89cbcae13ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Sat, 5 Aug 2017 10:30:08 +0200 Subject: [PATCH 21/30] added changes as suggested --- lib/react_on_rails/locales_to_js.rb | 4 ++-- spec/react_on_rails/locales_to_js_spec.rb | 9 +-------- spec/spec/examples.txt | 7 +++++++ 3 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 spec/spec/examples.txt diff --git a/lib/react_on_rails/locales_to_js.rb b/lib/react_on_rails/locales_to_js.rb index e16c9fdc1..330cc4665 100644 --- a/lib/react_on_rails/locales_to_js.rb +++ b/lib/react_on_rails/locales_to_js.rb @@ -5,8 +5,8 @@ module ReactOnRails class LocalesToJs def initialize - unless File.directory?(i18n_dir.to_s) - raise "i18n_dir is not a directory did you set i18n_dir in react_on_rails intializer?" + if !i18n_dir.nil? && !File.directory?(i18n_dir) + raise "config.i18n_dir is set and it is not a directory. Did you set config.i18n_dir in the react_on_rails initializer?" end return unless obsolete? @translations, @defaults = generate_translations diff --git a/spec/react_on_rails/locales_to_js_spec.rb b/spec/react_on_rails/locales_to_js_spec.rb index 68b2bb9da..af650bfa4 100644 --- a/spec/react_on_rails/locales_to_js_spec.rb +++ b/spec/react_on_rails/locales_to_js_spec.rb @@ -13,14 +13,7 @@ module ReactOnRails ReactOnRails.configure do |config| config.i18n_dir = '' end - expect { ReactOnRails::LocalesToJs.new }.to raise_error(/did you set i18n_dir in react_on_rails intializer?/) - end - - it "with i18n_dir set to nil" do - ReactOnRails.configure do |config| - config.i18n_dir = nil - end - expect { ReactOnRails::LocalesToJs.new }.to raise_error(/did you set i18n_dir in react_on_rails intializer?/) + expect { ReactOnRails::LocalesToJs.new }.to raise_error(/config.i18n_dir is set and it is not a directory. Did you set config.i18n_dir in the react_on_rails initializer?/) end shared_examples "locale to js" do diff --git a/spec/spec/examples.txt b/spec/spec/examples.txt new file mode 100644 index 000000000..a7829e51e --- /dev/null +++ b/spec/spec/examples.txt @@ -0,0 +1,7 @@ +example_id | status | run_time | +------------------------------------------------- | ------ | --------------- | +./react_on_rails/locales_to_js_spec.rb[1:1] | passed | 0.00158 seconds | +./react_on_rails/locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.01767 seconds | +./react_on_rails/locales_to_js_spec.rb[1:2:1:2:1] | passed | 0.00184 seconds | +./react_on_rails/locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00203 seconds | +./react_on_rails/locales_to_js_spec.rb[1:3:1:2:1] | passed | 0.00154 seconds | From e4ea7e3fb4ffdf261481b8136706e986282a0b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Sat, 5 Aug 2017 10:30:20 +0200 Subject: [PATCH 22/30] added changes as suggested --- spec/spec/examples.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 spec/spec/examples.txt diff --git a/spec/spec/examples.txt b/spec/spec/examples.txt deleted file mode 100644 index a7829e51e..000000000 --- a/spec/spec/examples.txt +++ /dev/null @@ -1,7 +0,0 @@ -example_id | status | run_time | -------------------------------------------------- | ------ | --------------- | -./react_on_rails/locales_to_js_spec.rb[1:1] | passed | 0.00158 seconds | -./react_on_rails/locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.01767 seconds | -./react_on_rails/locales_to_js_spec.rb[1:2:1:2:1] | passed | 0.00184 seconds | -./react_on_rails/locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00203 seconds | -./react_on_rails/locales_to_js_spec.rb[1:3:1:2:1] | passed | 0.00154 seconds | From 203b4898c7af22508c507431a3a9f78bfe0b0df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Fri, 11 Aug 2017 08:18:24 +0200 Subject: [PATCH 23/30] updated changelog.md --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f06f3f463..ac045959f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,6 @@ Changes since last non-beta release. - Fixed `react_component_hash` functionality in cases of prerendering errors: [PR 960](https://github.com/shakacode/react_on_rails/pull/960) by [Judahmeek](https://github.com/Judahmeek) *Please add entries here for your pull requests.* -<<<<<<< HEAD - Changes check in locales_to_js to check for i18n_dir.blank? and i18n_dir.directory? ### [10.0.0] - 2017-10-08 @@ -55,6 +54,9 @@ gem "webpacker" ``` ======= - Fixes check for i18n_dir returning false when present in LocalesToJs. +======= +- Fixes check for i18n_dir in LocalesToJs returning false when i18n_dir was set. +>>>>>>> updated changelog.md - Fixes GitUtils.uncommitted_changes? throwing an error when called in an environment without Git, and allows install generator to be run successfully with `--ignore-warnings` [#878](https://github.com/shakacode/react_on_rails/pull/878) by [jasonblalock](https://github.com/jasonblalock) - Update for the renaming in the `WebpackConfigLoader` in your webpack configuration. From fc7eff224a239fb56ab7571b5c2cb67c4b6dd4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Fri, 11 Aug 2017 11:09:41 +0200 Subject: [PATCH 24/30] updated changelog.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac045959f..c97596c69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,9 @@ gem "webpacker" ======= - Fixes check for i18n_dir in LocalesToJs returning false when i18n_dir was set. >>>>>>> updated changelog.md +======= +- Fixes check for i18n_dir in LocalesToJs returning false when i18n_dir was set. [#899](https://github.com/shakacode/react_on_rails/pull/899) by [hakongit](https://github.com/hakongit) +>>>>>>> updated changelog.md - Fixes GitUtils.uncommitted_changes? throwing an error when called in an environment without Git, and allows install generator to be run successfully with `--ignore-warnings` [#878](https://github.com/shakacode/react_on_rails/pull/878) by [jasonblalock](https://github.com/jasonblalock) - Update for the renaming in the `WebpackConfigLoader` in your webpack configuration. From 39fe5b241e36aa7e4bc8b6c6894ffb9709e35a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Tue, 29 Aug 2017 14:35:09 +0200 Subject: [PATCH 25/30] updated with check for i18n_yml_dir --- lib/react_on_rails/locales_to_js.rb | 1 + spec/spec/examples.txt | 171 ++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+) create mode 100644 spec/spec/examples.txt diff --git a/lib/react_on_rails/locales_to_js.rb b/lib/react_on_rails/locales_to_js.rb index 330cc4665..56d1faed3 100644 --- a/lib/react_on_rails/locales_to_js.rb +++ b/lib/react_on_rails/locales_to_js.rb @@ -8,6 +8,7 @@ def initialize if !i18n_dir.nil? && !File.directory?(i18n_dir) raise "config.i18n_dir is set and it is not a directory. Did you set config.i18n_dir in the react_on_rails initializer?" end + return if i18n_yml_dir.nil? return unless obsolete? @translations, @defaults = generate_translations convert diff --git a/spec/spec/examples.txt b/spec/spec/examples.txt new file mode 100644 index 000000000..5805e060f --- /dev/null +++ b/spec/spec/examples.txt @@ -0,0 +1,171 @@ +example_id | status | run_time | +--------------------------------------------------------------------------- | ------ | --------------- | +./react_on_rails/assets_precompile_spec.rb[1:1:1] | passed | 0.00667 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:2] | passed | 0.00182 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:3] | passed | 0.00073 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:4] | passed | 0.00079 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:5:1] | passed | 0.00191 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:6] | passed | 0.00081 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:7] | passed | 0.00088 seconds | +./react_on_rails/assets_precompile_spec.rb[1:1:8] | passed | 0.00132 seconds | +./react_on_rails/assets_precompile_spec.rb[1:2:1] | passed | 0.00123 seconds | +./react_on_rails/assets_precompile_spec.rb[1:2:2] | passed | 0.00308 seconds | +./react_on_rails/assets_precompile_spec.rb[1:2:3] | passed | 0.00142 seconds | +./react_on_rails/assets_precompile_spec.rb[1:3:1] | passed | 0.00308 seconds | +./react_on_rails/assets_precompile_spec.rb[1:4:1] | passed | 0.01492 seconds | +./react_on_rails/configuration_spec.rb[1:1] | passed | 0.00018 seconds | +./react_on_rails/configuration_spec.rb[1:2] | passed | 0.00014 seconds | +./react_on_rails/configuration_spec.rb[1:3] | passed | 0.00016 seconds | +./react_on_rails/configuration_spec.rb[1:4] | passed | 0.00017 seconds | +./react_on_rails/configuration_spec.rb[1:5] | passed | 0.00012 seconds | +./react_on_rails/configuration_spec.rb[1:6] | passed | 0.00012 seconds | +./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:1] | passed | 0.0002 seconds | +./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:2] | passed | 0.00017 seconds | +./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:3] | passed | 0.00019 seconds | +./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:4] | passed | 0.00021 seconds | +./react_on_rails/generators/dev_tests_generator_spec.rb[1:2:1] | passed | 0.00027 seconds | +./react_on_rails/generators/generator_messages_spec.rb[1:1] | passed | 0.0029 seconds | +./react_on_rails/generators/generator_messages_spec.rb[1:2] | passed | 0.00352 seconds | +./react_on_rails/generators/generator_messages_spec.rb[1:3] | passed | 0.0004 seconds | +./react_on_rails/generators/generator_messages_spec.rb[1:4] | passed | 0.00025 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:1] | passed | 0.00025 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:2] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:3] | passed | 0.00016 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:4] | passed | 0.00023 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:5] | passed | 0.00017 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:6] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:7] | passed | 0.0002 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:1:8] | passed | 0.00016 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:1] | passed | 0.00025 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:2] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:3] | passed | 0.00014 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:4] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:5] | passed | 0.00022 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:6] | passed | 0.0002 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:7] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:8] | passed | 0.00028 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:2:9] | passed | 0.00032 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:1] | passed | 0.00026 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:2] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:3] | passed | 0.00014 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:4] | passed | 0.00021 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:5] | passed | 0.00015 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:6] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:7] | passed | 0.00014 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:8] | passed | 0.0002 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:3:9] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:1] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:2] | passed | 0.00018 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:3] | passed | 0.00018 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:4] | passed | 0.0002 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:5] | passed | 0.00017 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:6] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:4:7] | passed | 0.00012 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:1] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:2] | passed | 0.00014 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:3] | passed | 0.00014 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:4] | passed | 0.00016 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:5] | passed | 0.00012 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:6] | passed | 0.00012 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:5:7] | passed | 0.00012 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:6:1] | passed | 0.00025 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:6:2] | passed | 0.00029 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:6:3] | passed | 0.00013 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:6:4] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:6:5] | passed | 0.00017 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:6:6] | passed | 0.00017 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:7:1] | passed | 0.00027 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:7:2] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:7:3] | passed | 0.00019 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:7:4] | passed | 0.00024 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:7:5] | passed | 0.00042 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:7:6] | passed | 0.00025 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:8:1] | passed | 0.00027 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:9:1] | passed | 0.0397 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:10:1] | passed | 0.03735 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:10:2] | passed | 0.04064 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:11:1] | passed | 0.00056 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:11:2] | passed | 0.00025 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:12:1] | passed | 0.00031 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:12:2] | passed | 0.00033 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:13:1] | passed | 0.00026 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:13:2] | passed | 0.00028 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:14:1] | passed | 0.00031 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:14:2] | passed | 0.00033 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:15:1] | passed | 0.04101 seconds | +./react_on_rails/generators/install_generator_spec.rb[1:15:2] | passed | 0.041 seconds | +./react_on_rails/generators/version_syntax_converter_spec.rb[1:1:1:1] | passed | 0.00021 seconds | +./react_on_rails/generators/version_syntax_converter_spec.rb[1:1:2:1] | passed | 0.00015 seconds | +./react_on_rails/generators/version_syntax_converter_spec.rb[1:2:1:1] | passed | 0.00014 seconds | +./react_on_rails/generators/version_syntax_converter_spec.rb[1:2:2:1] | passed | 0.00017 seconds | +./react_on_rails/generators/version_syntax_converter_spec.rb[1:2:3:1] | passed | 0.00014 seconds | +./react_on_rails/git_utils_spec.rb[1:1:1:1] | passed | 0.00158 seconds | +./react_on_rails/git_utils_spec.rb[1:1:2:1] | passed | 0.00074 seconds | +./react_on_rails/git_utils_spec.rb[1:1:3:1] | passed | 0.00074 seconds | +./react_on_rails/json_output_spec.rb[1:1:1:1:1] | passed | 0.00061 seconds | +./react_on_rails/json_output_spec.rb[1:1:2:1:1] | passed | 0.00046 seconds | +./react_on_rails/json_output_spec.rb[1:2:1:1] | passed | 0.00028 seconds | +./react_on_rails/locales_to_js_spec.rb[1:1] | passed | 0.00035 seconds | +./react_on_rails/locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.00482 seconds | +./react_on_rails/locales_to_js_spec.rb[1:2:1:2:1] | passed | 0.00209 seconds | +./react_on_rails/locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00172 seconds | +./react_on_rails/locales_to_js_spec.rb[1:3:1:2:1] | passed | 0.0014 seconds | +./react_on_rails/react_component/options_spec.rb[1:1] | passed | 0.00016 seconds | +./react_on_rails/react_component/options_spec.rb[1:2:1:1] | passed | 0.00009 seconds | +./react_on_rails/react_component/options_spec.rb[1:2:2:1] | passed | 0.0001 seconds | +./react_on_rails/react_component/options_spec.rb[1:3:1] | passed | 0.00015 seconds | +./react_on_rails/react_component/options_spec.rb[1:4:1:1] | passed | 0.00035 seconds | +./react_on_rails/react_component/options_spec.rb[1:4:1:2] | passed | 0.00033 seconds | +./react_on_rails/react_component/options_spec.rb[1:4:2:1] | passed | 0.00013 seconds | +./react_on_rails/react_component/options_spec.rb[1:5:1:1] | passed | 0.00008 seconds | +./react_on_rails/react_component/options_spec.rb[1:5:2:1] | passed | 0.00007 seconds | +./react_on_rails/react_component/options_spec.rb[1:6:1:1] | passed | 0.0001 seconds | +./react_on_rails/react_component/options_spec.rb[1:6:2:1] | passed | 0.00016 seconds | +./react_on_rails/react_component/options_spec.rb[1:7:1:1] | passed | 0.00012 seconds | +./react_on_rails/react_component/options_spec.rb[1:7:2:1] | passed | 0.00013 seconds | +./react_on_rails/react_component/options_spec.rb[1:8:1:1] | passed | 0.00011 seconds | +./react_on_rails/react_component/options_spec.rb[1:8:2:1] | passed | 0.0001 seconds | +./react_on_rails/react_component/options_spec.rb[1:9:1:1] | passed | 0.00011 seconds | +./react_on_rails/react_component/options_spec.rb[1:9:2:1] | passed | 0.0001 seconds | +./react_on_rails/react_on_rails_spec.rb[1:1] | passed | 0.00007 seconds | +./react_on_rails/test_helper/ensure_assets_compiled_spec.rb[1:1:1:1] | passed | 0.0005 seconds | +./react_on_rails/test_helper/ensure_assets_compiled_spec.rb[1:1:2:1] | passed | 0.00031 seconds | +./react_on_rails/test_helper/webpack_assets_compiler_spec.rb[1:1:1:1] | passed | 0.00697 seconds | +./react_on_rails/test_helper/webpack_assets_compiler_spec.rb[1:1:1:2] | passed | 0.00822 seconds | +./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:1:1] | passed | 0.42377 seconds | +./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:2:1] | passed | 0.01223 seconds | +./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:3:1] | passed | 0.00078 seconds | +./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:4:1] | passed | 0.00069 seconds | +./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:5:1] | passed | 0.00766 seconds | +./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:6:1] | passed | 0.00713 seconds | +./react_on_rails/utils_spec.rb[1:1:1] | passed | 0.00031 seconds | +./react_on_rails/utils_spec.rb[1:2:1:1] | passed | 0.00012 seconds | +./react_on_rails/utils_spec.rb[1:2:2:1] | passed | 0.00017 seconds | +./react_on_rails/utils_spec.rb[1:2:3:1] | passed | 0.00009 seconds | +./react_on_rails/utils_spec.rb[1:2:4:1] | passed | 0.00027 seconds | +./react_on_rails/utils_spec.rb[1:2:5:1] | passed | 0.00037 seconds | +./react_on_rails/utils_spec.rb[1:3:1:1:1] | passed | 0.00038 seconds | +./react_on_rails/utils_spec.rb[1:3:1:2:1] | passed | 0.00028 seconds | +./react_on_rails/utils_spec.rb[1:3:1:3:1] | passed | 0.00023 seconds | +./react_on_rails/utils_spec.rb[1:3:1:4:1] | passed | 0.00025 seconds | +./react_on_rails/utils_spec.rb[1:3:1:5:1] | passed | 0.00027 seconds | +./react_on_rails/utils_spec.rb[1:3:1:6:1] | passed | 0.00238 seconds | +./react_on_rails/utils_spec.rb[1:3:2:1:1] | passed | 0.00058 seconds | +./react_on_rails/utils_spec.rb[1:3:2:2:1] | passed | 0.00051 seconds | +./react_on_rails/version_checker_spec.rb[1:1:1:1] | passed | 0.00068 seconds | +./react_on_rails/version_checker_spec.rb[1:1:2:1] | passed | 0.00054 seconds | +./react_on_rails/version_checker_spec.rb[1:1:3:1] | passed | 0.00037 seconds | +./react_on_rails/version_checker_spec.rb[1:1:4:1] | passed | 0.00083 seconds | +./react_on_rails/version_checker_spec.rb[1:1:5:1] | passed | 0.00085 seconds | +./react_on_rails/version_checker_spec.rb[1:2:1:1:1] | passed | 0.00023 seconds | +./react_on_rails/version_checker_spec.rb[1:2:1:2:1] | passed | 0.00024 seconds | +./react_on_rails/version_checker_spec.rb[1:2:1:3:1] | passed | 0.00021 seconds | +./react_on_rails/version_checker_spec.rb[1:2:2:1:1] | passed | 0.00015 seconds | +./react_on_rails/version_checker_spec.rb[1:2:2:2:1] | passed | 0.00022 seconds | +./react_on_rails/version_checker_spec.rb[1:2:2:3:1] | passed | 0.00019 seconds | +./react_on_rails/version_checker_spec.rb[1:2:3:1:1] | passed | 0.00018 seconds | +./react_on_rails/version_checker_spec.rb[1:2:3:2:1] | passed | 0.0002 seconds | +./react_on_rails/version_checker_spec.rb[1:2:3:3:1] | passed | 0.00014 seconds | +./react_on_rails/version_checker_spec.rb[1:2:4:1:1] | passed | 0.00016 seconds | +./react_on_rails/version_checker_spec.rb[1:2:4:2:1] | passed | 0.00027 seconds | +./react_on_rails/version_checker_spec.rb[1:2:4:3:1] | passed | 0.00014 seconds | From 8804ddf96748fa70adb58f5145c663c1210ff7d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Tue, 29 Aug 2017 14:35:16 +0200 Subject: [PATCH 26/30] updated with check for i18n_yml_dir --- spec/spec/examples.txt | 171 ----------------------------------------- 1 file changed, 171 deletions(-) delete mode 100644 spec/spec/examples.txt diff --git a/spec/spec/examples.txt b/spec/spec/examples.txt deleted file mode 100644 index 5805e060f..000000000 --- a/spec/spec/examples.txt +++ /dev/null @@ -1,171 +0,0 @@ -example_id | status | run_time | ---------------------------------------------------------------------------- | ------ | --------------- | -./react_on_rails/assets_precompile_spec.rb[1:1:1] | passed | 0.00667 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:2] | passed | 0.00182 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:3] | passed | 0.00073 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:4] | passed | 0.00079 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:5:1] | passed | 0.00191 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:6] | passed | 0.00081 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:7] | passed | 0.00088 seconds | -./react_on_rails/assets_precompile_spec.rb[1:1:8] | passed | 0.00132 seconds | -./react_on_rails/assets_precompile_spec.rb[1:2:1] | passed | 0.00123 seconds | -./react_on_rails/assets_precompile_spec.rb[1:2:2] | passed | 0.00308 seconds | -./react_on_rails/assets_precompile_spec.rb[1:2:3] | passed | 0.00142 seconds | -./react_on_rails/assets_precompile_spec.rb[1:3:1] | passed | 0.00308 seconds | -./react_on_rails/assets_precompile_spec.rb[1:4:1] | passed | 0.01492 seconds | -./react_on_rails/configuration_spec.rb[1:1] | passed | 0.00018 seconds | -./react_on_rails/configuration_spec.rb[1:2] | passed | 0.00014 seconds | -./react_on_rails/configuration_spec.rb[1:3] | passed | 0.00016 seconds | -./react_on_rails/configuration_spec.rb[1:4] | passed | 0.00017 seconds | -./react_on_rails/configuration_spec.rb[1:5] | passed | 0.00012 seconds | -./react_on_rails/configuration_spec.rb[1:6] | passed | 0.00012 seconds | -./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:1] | passed | 0.0002 seconds | -./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:2] | passed | 0.00017 seconds | -./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:3] | passed | 0.00019 seconds | -./react_on_rails/generators/dev_tests_generator_spec.rb[1:1:4] | passed | 0.00021 seconds | -./react_on_rails/generators/dev_tests_generator_spec.rb[1:2:1] | passed | 0.00027 seconds | -./react_on_rails/generators/generator_messages_spec.rb[1:1] | passed | 0.0029 seconds | -./react_on_rails/generators/generator_messages_spec.rb[1:2] | passed | 0.00352 seconds | -./react_on_rails/generators/generator_messages_spec.rb[1:3] | passed | 0.0004 seconds | -./react_on_rails/generators/generator_messages_spec.rb[1:4] | passed | 0.00025 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:1] | passed | 0.00025 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:2] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:3] | passed | 0.00016 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:4] | passed | 0.00023 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:5] | passed | 0.00017 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:6] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:7] | passed | 0.0002 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:1:8] | passed | 0.00016 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:1] | passed | 0.00025 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:2] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:3] | passed | 0.00014 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:4] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:5] | passed | 0.00022 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:6] | passed | 0.0002 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:7] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:8] | passed | 0.00028 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:2:9] | passed | 0.00032 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:1] | passed | 0.00026 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:2] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:3] | passed | 0.00014 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:4] | passed | 0.00021 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:5] | passed | 0.00015 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:6] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:7] | passed | 0.00014 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:8] | passed | 0.0002 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:3:9] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:1] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:2] | passed | 0.00018 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:3] | passed | 0.00018 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:4] | passed | 0.0002 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:5] | passed | 0.00017 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:6] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:4:7] | passed | 0.00012 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:1] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:2] | passed | 0.00014 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:3] | passed | 0.00014 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:4] | passed | 0.00016 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:5] | passed | 0.00012 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:6] | passed | 0.00012 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:5:7] | passed | 0.00012 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:6:1] | passed | 0.00025 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:6:2] | passed | 0.00029 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:6:3] | passed | 0.00013 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:6:4] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:6:5] | passed | 0.00017 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:6:6] | passed | 0.00017 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:7:1] | passed | 0.00027 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:7:2] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:7:3] | passed | 0.00019 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:7:4] | passed | 0.00024 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:7:5] | passed | 0.00042 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:7:6] | passed | 0.00025 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:8:1] | passed | 0.00027 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:9:1] | passed | 0.0397 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:10:1] | passed | 0.03735 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:10:2] | passed | 0.04064 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:11:1] | passed | 0.00056 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:11:2] | passed | 0.00025 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:12:1] | passed | 0.00031 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:12:2] | passed | 0.00033 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:13:1] | passed | 0.00026 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:13:2] | passed | 0.00028 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:14:1] | passed | 0.00031 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:14:2] | passed | 0.00033 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:15:1] | passed | 0.04101 seconds | -./react_on_rails/generators/install_generator_spec.rb[1:15:2] | passed | 0.041 seconds | -./react_on_rails/generators/version_syntax_converter_spec.rb[1:1:1:1] | passed | 0.00021 seconds | -./react_on_rails/generators/version_syntax_converter_spec.rb[1:1:2:1] | passed | 0.00015 seconds | -./react_on_rails/generators/version_syntax_converter_spec.rb[1:2:1:1] | passed | 0.00014 seconds | -./react_on_rails/generators/version_syntax_converter_spec.rb[1:2:2:1] | passed | 0.00017 seconds | -./react_on_rails/generators/version_syntax_converter_spec.rb[1:2:3:1] | passed | 0.00014 seconds | -./react_on_rails/git_utils_spec.rb[1:1:1:1] | passed | 0.00158 seconds | -./react_on_rails/git_utils_spec.rb[1:1:2:1] | passed | 0.00074 seconds | -./react_on_rails/git_utils_spec.rb[1:1:3:1] | passed | 0.00074 seconds | -./react_on_rails/json_output_spec.rb[1:1:1:1:1] | passed | 0.00061 seconds | -./react_on_rails/json_output_spec.rb[1:1:2:1:1] | passed | 0.00046 seconds | -./react_on_rails/json_output_spec.rb[1:2:1:1] | passed | 0.00028 seconds | -./react_on_rails/locales_to_js_spec.rb[1:1] | passed | 0.00035 seconds | -./react_on_rails/locales_to_js_spec.rb[1:2:1:1:1] | passed | 0.00482 seconds | -./react_on_rails/locales_to_js_spec.rb[1:2:1:2:1] | passed | 0.00209 seconds | -./react_on_rails/locales_to_js_spec.rb[1:3:1:1:1] | passed | 0.00172 seconds | -./react_on_rails/locales_to_js_spec.rb[1:3:1:2:1] | passed | 0.0014 seconds | -./react_on_rails/react_component/options_spec.rb[1:1] | passed | 0.00016 seconds | -./react_on_rails/react_component/options_spec.rb[1:2:1:1] | passed | 0.00009 seconds | -./react_on_rails/react_component/options_spec.rb[1:2:2:1] | passed | 0.0001 seconds | -./react_on_rails/react_component/options_spec.rb[1:3:1] | passed | 0.00015 seconds | -./react_on_rails/react_component/options_spec.rb[1:4:1:1] | passed | 0.00035 seconds | -./react_on_rails/react_component/options_spec.rb[1:4:1:2] | passed | 0.00033 seconds | -./react_on_rails/react_component/options_spec.rb[1:4:2:1] | passed | 0.00013 seconds | -./react_on_rails/react_component/options_spec.rb[1:5:1:1] | passed | 0.00008 seconds | -./react_on_rails/react_component/options_spec.rb[1:5:2:1] | passed | 0.00007 seconds | -./react_on_rails/react_component/options_spec.rb[1:6:1:1] | passed | 0.0001 seconds | -./react_on_rails/react_component/options_spec.rb[1:6:2:1] | passed | 0.00016 seconds | -./react_on_rails/react_component/options_spec.rb[1:7:1:1] | passed | 0.00012 seconds | -./react_on_rails/react_component/options_spec.rb[1:7:2:1] | passed | 0.00013 seconds | -./react_on_rails/react_component/options_spec.rb[1:8:1:1] | passed | 0.00011 seconds | -./react_on_rails/react_component/options_spec.rb[1:8:2:1] | passed | 0.0001 seconds | -./react_on_rails/react_component/options_spec.rb[1:9:1:1] | passed | 0.00011 seconds | -./react_on_rails/react_component/options_spec.rb[1:9:2:1] | passed | 0.0001 seconds | -./react_on_rails/react_on_rails_spec.rb[1:1] | passed | 0.00007 seconds | -./react_on_rails/test_helper/ensure_assets_compiled_spec.rb[1:1:1:1] | passed | 0.0005 seconds | -./react_on_rails/test_helper/ensure_assets_compiled_spec.rb[1:1:2:1] | passed | 0.00031 seconds | -./react_on_rails/test_helper/webpack_assets_compiler_spec.rb[1:1:1:1] | passed | 0.00697 seconds | -./react_on_rails/test_helper/webpack_assets_compiler_spec.rb[1:1:1:2] | passed | 0.00822 seconds | -./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:1:1] | passed | 0.42377 seconds | -./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:2:1] | passed | 0.01223 seconds | -./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:3:1] | passed | 0.00078 seconds | -./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:4:1] | passed | 0.00069 seconds | -./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:5:1] | passed | 0.00766 seconds | -./react_on_rails/test_helper/webpack_assets_status_checker_spec.rb[1:1:6:1] | passed | 0.00713 seconds | -./react_on_rails/utils_spec.rb[1:1:1] | passed | 0.00031 seconds | -./react_on_rails/utils_spec.rb[1:2:1:1] | passed | 0.00012 seconds | -./react_on_rails/utils_spec.rb[1:2:2:1] | passed | 0.00017 seconds | -./react_on_rails/utils_spec.rb[1:2:3:1] | passed | 0.00009 seconds | -./react_on_rails/utils_spec.rb[1:2:4:1] | passed | 0.00027 seconds | -./react_on_rails/utils_spec.rb[1:2:5:1] | passed | 0.00037 seconds | -./react_on_rails/utils_spec.rb[1:3:1:1:1] | passed | 0.00038 seconds | -./react_on_rails/utils_spec.rb[1:3:1:2:1] | passed | 0.00028 seconds | -./react_on_rails/utils_spec.rb[1:3:1:3:1] | passed | 0.00023 seconds | -./react_on_rails/utils_spec.rb[1:3:1:4:1] | passed | 0.00025 seconds | -./react_on_rails/utils_spec.rb[1:3:1:5:1] | passed | 0.00027 seconds | -./react_on_rails/utils_spec.rb[1:3:1:6:1] | passed | 0.00238 seconds | -./react_on_rails/utils_spec.rb[1:3:2:1:1] | passed | 0.00058 seconds | -./react_on_rails/utils_spec.rb[1:3:2:2:1] | passed | 0.00051 seconds | -./react_on_rails/version_checker_spec.rb[1:1:1:1] | passed | 0.00068 seconds | -./react_on_rails/version_checker_spec.rb[1:1:2:1] | passed | 0.00054 seconds | -./react_on_rails/version_checker_spec.rb[1:1:3:1] | passed | 0.00037 seconds | -./react_on_rails/version_checker_spec.rb[1:1:4:1] | passed | 0.00083 seconds | -./react_on_rails/version_checker_spec.rb[1:1:5:1] | passed | 0.00085 seconds | -./react_on_rails/version_checker_spec.rb[1:2:1:1:1] | passed | 0.00023 seconds | -./react_on_rails/version_checker_spec.rb[1:2:1:2:1] | passed | 0.00024 seconds | -./react_on_rails/version_checker_spec.rb[1:2:1:3:1] | passed | 0.00021 seconds | -./react_on_rails/version_checker_spec.rb[1:2:2:1:1] | passed | 0.00015 seconds | -./react_on_rails/version_checker_spec.rb[1:2:2:2:1] | passed | 0.00022 seconds | -./react_on_rails/version_checker_spec.rb[1:2:2:3:1] | passed | 0.00019 seconds | -./react_on_rails/version_checker_spec.rb[1:2:3:1:1] | passed | 0.00018 seconds | -./react_on_rails/version_checker_spec.rb[1:2:3:2:1] | passed | 0.0002 seconds | -./react_on_rails/version_checker_spec.rb[1:2:3:3:1] | passed | 0.00014 seconds | -./react_on_rails/version_checker_spec.rb[1:2:4:1:1] | passed | 0.00016 seconds | -./react_on_rails/version_checker_spec.rb[1:2:4:2:1] | passed | 0.00027 seconds | -./react_on_rails/version_checker_spec.rb[1:2:4:3:1] | passed | 0.00014 seconds | From e555441d309da642071b19086c4ffc448e762b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Tue, 24 Oct 2017 20:33:17 +0200 Subject: [PATCH 27/30] rebased on top of master --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c97596c69..860d5f61c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ Changes since last non-beta release. - Fixed `react_component_hash` functionality in cases of prerendering errors: [PR 960](https://github.com/shakacode/react_on_rails/pull/960) by [Judahmeek](https://github.com/Judahmeek) *Please add entries here for your pull requests.* -- Changes check in locales_to_js to check for i18n_dir.blank? and i18n_dir.directory? +- Fixes check for i18n_dir in LocalesToJs returning false when i18n_dir was set. #899 by hakongit ### [10.0.0] - 2017-10-08 #### Created From 69a2ef525573063e076eac269f834a1cacd90237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Wed, 25 Oct 2017 07:26:12 +0200 Subject: [PATCH 28/30] squashed comments --- CHANGELOG.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55f2f4e38..d0648ccd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,15 +53,6 @@ For an example of upgrading, see [react-webpack-rails-tutorial/pull/416](https:/ ```rb gem "webpacker" ``` -======= -- Fixes check for i18n_dir returning false when present in LocalesToJs. -======= -- Fixes check for i18n_dir in LocalesToJs returning false when i18n_dir was set. ->>>>>>> updated changelog.md -======= -- Fixes check for i18n_dir in LocalesToJs returning false when i18n_dir was set. [#899](https://github.com/shakacode/react_on_rails/pull/899) by [hakongit](https://github.com/hakongit) ->>>>>>> updated changelog.md -- Fixes GitUtils.uncommitted_changes? throwing an error when called in an environment without Git, and allows install generator to be run successfully with `--ignore-warnings` [#878](https://github.com/shakacode/react_on_rails/pull/878) by [jasonblalock](https://github.com/jasonblalock) - Update for the renaming in the `WebpackConfigLoader` in your webpack configuration. You will need to rename the following object properties: @@ -141,12 +132,7 @@ gem "webpacker" - The package.json file created by the generator now creates minified javascript production builds by default. This was done by adding the -p flag to webpack on the build:production script. [#895](https://github.com/shakacode/react_on_rails/pull/895) by [serodriguez68 ](https://github.com/serodriguez68) - Fixes GitUtils.uncommitted_changes? throwing an error when called in an environment without Git, and allows install generator to be run successfully with `--ignore-warnings` [#878](https://github.com/shakacode/react_on_rails/pull/878) by [jasonblalock](https://github.com/jasonblalock). -<<<<<<< HEAD - -## [8.0.5] -======= ## [8.0.5] - 2017-07-04 ->>>>>>> my-branch ### fixed - Corrects `devBuild` value for webpack production build from webpackConfigLoader. [#877](https://github.com/shakacode/react_on_rails/pull/877) by [chenqingspring](https://github.com/chenqingspring). - Remove contentBase deprecation warning message. [#878](https://github.com/shakacode/react_on_rails/pull/878) by [ened ](https://github.com/ened). From 3b38dd1df8f8561bf36a588af914a66e7c602c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Wed, 25 Oct 2017 07:26:43 +0200 Subject: [PATCH 29/30] squashed comments --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0648ccd5..4826aba58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,6 @@ To clarify, the method itself is not deprecated, only certain functionality whic ### [9.0.0] - 2017-09-06 Updated React on Rails to depend on [rails/webpacker](https://github.com/rails/webpacker). [PR 908](https://github.com/shakacode/react_on_rails/pull/908) by [justin808](https://github.com/justin808). ->>>>>>> my-branch #### 9.0 from 8.x. Upgrade Instructions From 152aeca461c3376bafc1258230ae7b7a41e3a723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=85r=C3=B8en?= Date: Wed, 25 Oct 2017 07:27:39 +0200 Subject: [PATCH 30/30] squashed comments --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4826aba58..af7c43690 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ Changes since last non-beta release. - Fixed `react_component_hash` functionality in cases of prerendering errors: [PR 960](https://github.com/shakacode/react_on_rails/pull/960) by [Judahmeek](https://github.com/Judahmeek) *Please add entries here for your pull requests.* -- Fixes check for i18n_dir in LocalesToJs returning false when i18n_dir was set. [#899](https://github.com/shakacode/react_on_rails/pull/899) by [hakongit](https://github.com/hakongit) +- Fixes check for i18n_dir in LocalesToJs returning false when i18n_dir was set. [PR 899](https://github.com/shakacode/react_on_rails/pull/899) by [hakongit](https://github.com/hakongit) ### [10.0.0] - 2017-10-08 #### Created