Skip to content

Commit b10a581

Browse files
committed
fix main CI failures
1 parent 40d8193 commit b10a581

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

spec/dummy/spec/helpers/react_on_rails_helper_spec.rb

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -140,24 +140,19 @@ class PlainReactOnRailsHelper
140140

141141
let(:id) { "App-react-component-0" }
142142

143-
let(:react_definition_script_random) do
144-
<<-SCRIPT.strip_heredoc
145-
<script type="application/json" class="js-react-on-rails-component" \
146-
data-component-name="App" data-dom-id="App-react-component-0">{"name":"My Test Name"}</script>
147-
SCRIPT
148-
end
149-
150143
let(:react_definition_script) do
151144
<<-SCRIPT.strip_heredoc
152-
<script type="application/json" class="js-react-on-rails-component" \
153-
data-component-name="App" data-dom-id="App-react-component">{"name":"My Test Name"}</script>
145+
<script type="application/json" id="js-react-on-rails-context">{"railsEnv":"test","inMailer":false,"i18nLocale":"en","i18nDefaultLocale":"en","rorVersion":"14.1.0","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>
146+
<div id="App-react-component"></div>
147+
<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>
154148
SCRIPT
155149
end
156150

157151
let(:react_definition_script_no_params) do
158152
<<-SCRIPT.strip_heredoc
159-
<script type="application/json" class="js-react-on-rails-component" \
160-
data-component-name="App" data-dom-id="App-react-component">{}</script>
153+
<script type="application/json" id="js-react-on-rails-context">{"railsEnv":"test","inMailer":false,"i18nLocale":"en","i18nDefaultLocale":"en","rorVersion":"14.1.0","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>
154+
<div id="App-react-component"></div>
155+
<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="[]">{}</script>
161156
SCRIPT
162157
end
163158

@@ -203,7 +198,9 @@ class PlainReactOnRailsHelper
203198

204199
let(:react_definition_script) do
205200
<<-SCRIPT.strip_heredoc
206-
<script type="application/json" class="js-react-on-rails-component" data-component-name="App" data-dom-id="App-react-component">{"name":"My Test Name"}</script>
201+
<script type="application/json" id="js-react-on-rails-context">{"railsEnv":"test","inMailer":false,"i18nLocale":"en","i18nDefaultLocale":"en","rorVersion":"14.1.0","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>
202+
<div id="App-react-component"></div>
203+
<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>
207204
SCRIPT
208205
end
209206

@@ -216,7 +213,9 @@ class PlainReactOnRailsHelper
216213

217214
let(:react_definition_script) do
218215
<<-SCRIPT.strip_heredoc
219-
<script type="application/json" class="js-react-on-rails-component" data-component-name="App" data-dom-id="App-react-component-0">{"name":"My Test Name"}</script>
216+
<script type="application/json" id="js-react-on-rails-context">{"railsEnv":"test","inMailer":false,"i18nLocale":"en","i18nDefaultLocale":"en","rorVersion":"14.1.0","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>
217+
<div id="App-react-component-0"></div>
218+
<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>
220219
SCRIPT
221220
end
222221

@@ -235,7 +234,9 @@ class PlainReactOnRailsHelper
235234

236235
let(:react_definition_script) do
237236
<<-SCRIPT.strip_heredoc
238-
<script type="application/json" class="js-react-on-rails-component" data-component-name="App" data-dom-id="App-react-component">{"name":"My Test Name"}</script>
237+
<script type="application/json" id="js-react-on-rails-context">{"railsEnv":"test","inMailer":false,"i18nLocale":"en","i18nDefaultLocale":"en","rorVersion":"14.1.0","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>
238+
<div id="App-react-component"></div>
239+
<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>
239240
SCRIPT
240241
end
241242

@@ -250,7 +251,9 @@ class PlainReactOnRailsHelper
250251

251252
let(:react_definition_script) do
252253
<<-SCRIPT.strip_heredoc
253-
<script type="application/json" class="js-react-on-rails-component" data-component-name="App" data-dom-id="shaka_div">{"name":"My Test Name"}</script>
254+
<script type="application/json" id="js-react-on-rails-context">{"railsEnv":"test","inMailer":false,"i18nLocale":"en","i18nDefaultLocale":"en","rorVersion":"14.1.0","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>
255+
<div id="shaka_div"></div>
256+
<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>
254257
SCRIPT
255258
end
256259

0 commit comments

Comments
 (0)