Revert "tmp"

This reverts commit a66a617.

Author: AbanoubGhadban

spec/dummy/spec/helpers/react_on_rails_helper_spec.rb

@@ -40,12 +40,6 @@ class PlainReactOnRailsHelper
     "{\"hello\":\"world\",\"free\":\"of charge\",\"x\":\"</script><script>alert('foo')</script>\"}"
   end
 
-  let(:rails_context_script) do
-    <<-SCRIPT.strip_heredoc
-      <script type="application/json" id="js-react-on-rails-context">{"railsEnv":"test","inMailer":false,"i18nLocale":"en","i18nDefaultLocale":"en","rorVersion":"#{ReactOnRails::VERSION}","rorPro":false,"href":"http://foobar.com/development","location":"/development","scheme":"http","host":"foobar.com","port":null,"pathname":"/development","search":null,"httpAcceptLanguage":"en","somethingUseful":null,"serverSide":false}</script>
-    SCRIPT
-  end
-
   describe "#load_pack_for_generated_component" do
     let(:render_options) do
       ReactOnRails::ReactComponent::RenderOptions.new(react_component_name: "component_name",
@@ -148,7 +142,7 @@ class PlainReactOnRailsHelper
 
     let(:react_definition_script) do
       <<-SCRIPT.strip_heredoc
-        #{rails_context_script}
+        <script type="application/json" id="js-react-on-rails-context">{"railsEnv":"test","inMailer":false,"i18nLocale":"en","i18nDefaultLocale":"en","rorVersion":"#{ReactOnRails::VERSION}","rorPro":false,"href":"http://foobar.com/development","location":"/development","scheme":"http","host":"foobar.com","port":null,"pathname":"/development","search":null,"httpAcceptLanguage":"en","somethingUseful":null,"serverSide":false}</script>
         <div id="App-react-component"></div>
               <script type="application/json" class="js-react-on-rails-component" id="js-react-on-rails-component-App-react-component" data-component-name="App" data-dom-id="App-react-component" data-store-dependencies="[]">{"name":"My Test Name"}</script>
       SCRIPT
@@ -204,7 +198,7 @@ class PlainReactOnRailsHelper
 
       let(:react_definition_script) do
         <<-SCRIPT.strip_heredoc
-          #{rails_context_script}
+          <script type="application/json" id="js-react-on-rails-context">{"railsEnv":"test","inMailer":false,"i18nLocale":"en","i18nDefaultLocale":"en","rorVersion":"#{ReactOnRails::VERSION}","rorPro":false,"href":"http://foobar.com/development","location":"/development","scheme":"http","host":"foobar.com","port":null,"pathname":"/development","search":null,"httpAcceptLanguage":"en","somethingUseful":null,"serverSide":false}</script>
           <div id="App-react-component"></div>
                 <script type="application/json" class="js-react-on-rails-component" id="js-react-on-rails-component-App-react-component" data-component-name="App" data-dom-id="App-react-component" data-store-dependencies="[]">{"name":"My Test Name"}</script>
         SCRIPT
@@ -219,7 +213,7 @@ class PlainReactOnRailsHelper
 
       let(:react_definition_script) do
         <<-SCRIPT.strip_heredoc
-          #{rails_context_script}
+          <script type="application/json" id="js-react-on-rails-context">{"railsEnv":"test","inMailer":false,"i18nLocale":"en","i18nDefaultLocale":"en","rorVersion":"#{ReactOnRails::VERSION}","rorPro":false,"href":"http://foobar.com/development","location":"/development","scheme":"http","host":"foobar.com","port":null,"pathname":"/development","search":null,"httpAcceptLanguage":"en","somethingUseful":null,"serverSide":false}</script>
           <div id="App-react-component-0"></div>
                 <script type="application/json" class="js-react-on-rails-component" id="js-react-on-rails-component-App-react-component-0" data-component-name="App" data-dom-id="App-react-component-0" data-store-dependencies="[]">{"name":"My Test Name"}</script>
         SCRIPT
@@ -240,7 +234,7 @@ class PlainReactOnRailsHelper
 
       let(:react_definition_script) do
         <<-SCRIPT.strip_heredoc
-          #{rails_context_script}
+          <script type="application/json" id="js-react-on-rails-context">{"railsEnv":"test","inMailer":false,"i18nLocale":"en","i18nDefaultLocale":"en","rorVersion":"#{ReactOnRails::VERSION}","rorPro":false,"href":"http://foobar.com/development","location":"/development","scheme":"http","host":"foobar.com","port":null,"pathname":"/development","search":null,"httpAcceptLanguage":"en","somethingUseful":null,"serverSide":false}</script>
           <div id="App-react-component"></div>
                 <script type="application/json" class="js-react-on-rails-component" id="js-react-on-rails-component-App-react-component" data-component-name="App" data-dom-id="App-react-component" data-store-dependencies="[]">{"name":"My Test Name"}</script>
         SCRIPT
@@ -257,7 +251,7 @@ class PlainReactOnRailsHelper
 
       let(:react_definition_script) do
         <<-SCRIPT.strip_heredoc
-          #{rails_context_script}
+          <script type="application/json" id="js-react-on-rails-context">{"railsEnv":"test","inMailer":false,"i18nLocale":"en","i18nDefaultLocale":"en","rorVersion":"#{ReactOnRails::VERSION}","rorPro":false,"href":"http://foobar.com/development","location":"/development","scheme":"http","host":"foobar.com","port":null,"pathname":"/development","search":null,"httpAcceptLanguage":"en","somethingUseful":null,"serverSide":false}</script>
           <div id="shaka_div"></div>
                 <script type="application/json" class="js-react-on-rails-component" id="js-react-on-rails-component-shaka_div" data-component-name="App" data-dom-id="shaka_div" data-store-dependencies="[]">{"name":"My Test Name"}</script>
         SCRIPT
@@ -323,36 +317,27 @@ class PlainReactOnRailsHelper
   end
 
   describe "#redux_store" do
-    let(:store) { redux_store("reduxStore", props: props) }
-    let(:second_store) { redux_store("secondStore", props: props) }
+    subject(:store) { redux_store("reduxStore", props: props) }
 
     let(:props) do
       { name: "My Test Name" }
     end
+
     let(:react_store_script) do
       '<script type="application/json" data-js-react-on-rails-store="reduxStore">' \
         '{"name":"My Test Name"}' \
         "</script>"
     end
-    let(:second_react_store_script) do
-      '<script type="application/json" data-js-react-on-rails-store="secondStore">' \
-        '{"name":"My Test Name"}' \
-        "</script>"
-    end
 
     it { expect(self).to respond_to :redux_store }
 
-    it { expect(store).to be_an_instance_of ActiveSupport::SafeBuffer }
-    it { expect(store).to start_with "<script" }
-    it { expect(store).to end_with "</script>" }
-
-    it "adds the rails context script to the first store only" do
-      expect(store).to script_tag_be_included(react_store_script)
-      expect(store).to script_tag_be_included(rails_context_script)
+    it { is_expected.to be_an_instance_of ActiveSupport::SafeBuffer }
+    it { is_expected.to start_with "<script" }
+    it { is_expected.to end_with "</script>" }
 
-      expect(second_store).to script_tag_be_included(second_react_store_script)
-      expect(second_store).not_to script_tag_be_included(rails_context_script)
-    end
+    it {
+      expect(expect(store).target).to script_tag_be_included(react_store_script)
+    }
   end
 
   describe "#server_render_js", :js, type: :system do

spec/dummy/spec/support/script_tag_utils.rb

@@ -6,11 +6,9 @@
   opts = {}
   match do |actual|
     Nokogiri::HTML.fragment(actual).css("script").map do |script|
-      res = EquivalentXml.equivalent?(Nokogiri::HTML.fragment(script.to_s.strip),
-                                      Nokogiri::HTML.fragment(expected.to_s.strip),
-                                      opts)
-      binding.pry
-      res
+      EquivalentXml.equivalent?(Nokogiri::HTML.fragment(script.to_s.delete(" \t\r\n")),
+                                Nokogiri::HTML.fragment(expected.delete(" \t\r\n")),
+                                opts)
     end.include?(true)
   end