Got tests passing

client/app/bundles/comments/startup/ClientApp.jsx → client/app/bundles/comments/startup/App.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-
 import NonRouterCommentsContainer from '../containers/NonRouterCommentsContainer';
 
 export default (_props, _railsContext) => {

client/app/bundles/comments/startup/ClientRouterApp.jsx

@@ -1,3 +1,4 @@
+// Compare to ../ServerRouterApp.jsx
 import React from 'react';
 import { Provider } from 'react-redux';
 import ReactOnRails from 'react-on-rails';

client/app/bundles/comments/startup/ServerRouterApp.jsx

@@ -1,3 +1,4 @@
+// Compare to ../ClientRouterApp.jsx
 import React from 'react';
 import { Provider } from 'react-redux';
 import { match, RouterContext } from 'react-router';

client/app/bundles/comments/startup/clientRegistration.jsx

@@ -1,4 +1,4 @@
-import App from './ClientApp';
+import App from './App';
 import RouterApp from './ClientRouterApp';
 import SimpleCommentScreen from '../components/SimpleCommentScreen/SimpleCommentScreen';
 import routerCommentsStore from '../store/routerCommentsStore';

client/app/bundles/comments/startup/serverRegistration.jsx

@@ -1,5 +1,5 @@
 // Example of React + Redux
-import App from './ServerApp';
+import App from './App';
 import RouterApp from './ServerRouterApp';
 import SimpleCommentScreen from '../components/SimpleCommentScreen/SimpleCommentScreen';
 import ReactOnRails from 'react-on-rails';

spec/features/add_new_comment_spec.rb

@@ -5,42 +5,42 @@
 feature "Add new comment" do
   context "React Router", page: :main, js: true do
     context "via Horizontal Form", form: :horizontal do
-      include_examples "New Comment Submission"
+      include_examples "New Comment Submission", true
     end
     context "via Inline Form", form: :inline do
-      include_examples "New Comment Submission"
+      include_examples "New Comment Submission", true
     end
     context "via Stacked Form", form: :stacked do
-      include_examples "New Comment Submission"
+      include_examples "New Comment Submission", true
     end
   end
 
   context "React/Redux", page: :react_demo, js: true do
     context "via Horizontal Form", form: :horizontal do
-      include_examples "New Comment Submission"
+      include_examples "New Comment Submission", true
     end
     context "via Inline Form", form: :inline do
-      include_examples "New Comment Submission"
+      include_examples "New Comment Submission", true
     end
     context "via Stacked Form", form: :stacked do
-      include_examples "New Comment Submission"
+      include_examples "New Comment Submission", true
     end
   end
 
   context "simple page", page: :simple, js: true do
     context "via Horizontal Form", form: :horizontal do
-      include_examples "New Comment Submission"
+      include_examples "New Comment Submission", false
     end
     context "via Inline Form", form: :inline do
-      include_examples "New Comment Submission"
+      include_examples "New Comment Submission", false
     end
     context "via the Stacked Form", form: :stacked, driver: js_selenium_driver do
-      include_examples "New Comment Submission"
+      include_examples "New Comment Submission", false
     end
   end
 
   context "from classic page", page: :classic do
     background { click_link "New Comment" }
-    include_examples "New Comment Submission"
+    include_examples "New Comment Submission", false
   end
 end

spec/features/shared/examples.rb

@@ -1,7 +1,7 @@
 require "rails_helper"
 require "features/shared/contexts"
 
-shared_examples "New Comment Submission" do
+shared_examples "New Comment Submission" do |expect_comment_count|
   context "when the new comment is submitted" do
     let(:name) { "John Smith" }
     let(:text) { "Hello there!" }
@@ -10,8 +10,10 @@
     scenario "comment is added" do
       expect(page).to have_css(".js-comment-author", text: name)
       expect(page).to have_css(".js-comment-text", text: text)
-      expect(page).to have_css("#js-comment-count",
-                               text: "Comments: #{Comment.count}")
+      if expect_comment_count
+        expect(page).to have_css("#js-comment-count",
+                                 text: "Comments: #{Comment.count}")
+      end
     end
   end
 
@@ -20,8 +22,10 @@
 
     scenario "comment is not added" do
       expect(page).to have_selector(".comment", count: comments_count)
-      expect(page).to have_css("#js-comment-count",
-                               text: "Comments: #{Comment.count}")
+      if expect_comment_count
+        expect(page).to have_css("#js-comment-count",
+                                 text: "Comments: #{Comment.count}")
+      end
     end
   end