Merge pull request #32 from basemate/jonasjabari-patch-4

Fixed Specs for CI

Author: jonasjabari

.circleci/config.yml

@@ -36,15 +36,15 @@ jobs:
             - ./vendor/bundle
           key: v1-dependencies-{{ checksum "Gemfile.lock" }}
 
-      # Database setup
-      # - run: bundle exec rake db:create
-      # - run: bundle exec rake db:schema:load
-
       # Yarn Update
 
       - run: yarn install
       - run: cd spec/dummy
       - run: yarn install
+      
+      # Database setup
+      - run: bundle exec rake db:create
+      - run: bundle exec rake db:schema:load
 
       # run tests!
       - run:

spec/usage/base/component_spec.rb

@@ -465,7 +465,6 @@ def response
           components {
             div id: "my-component" do
               slot @options[:my_first_slot]
-              br
               slot @options[:my_second_slot]
             end
           }
@@ -516,7 +515,6 @@ def my_second_simple_slot
           <span id="my_simple_slot">
             some content
           </span>
-          <br/>
           <span id="my_simple_slot">
             foo from page
           </span>
@@ -568,9 +566,7 @@ def response
           components {
             div id: "my-other-component" do
               slot @options[:slots][:my_slot_from_component]
-              br
               slot @options[:slots][:my_slot_from_page]
-              br
               plain @foo
             end
           }
@@ -613,11 +609,9 @@ def my_slot_from_page
               <span id="my-slot-from-component">
                 foo from component
               </span>
-              <br/>
               <span id="my-slot-from-page">
                 foo from page
               </span>
-              <br/>
               foo from other component
             </div>
           </div>

spec/usage/base/page_spec.rb

@@ -122,9 +122,7 @@ def response
         components {
           div do
             partial :my_simple_partial
-            br
             partial :my_partial_with_param, "foo"
-            br
             partial :my_partial_with_partial
           end
         }
@@ -179,14 +177,10 @@ def my_action
         some content
       </span>
 
-      <br/>
-
       <span id="my_partial_with_param">
         content with param: foo
       </span>
 
-      <br/>
-
       <span id="my_partial_with_partial">
 
         <span id="my_simple_partial">
@@ -198,7 +192,6 @@ def my_action
     </div>
     HTML
 
-
     expect(stripped(static_output)).to include(stripped(expected_static_output))
 
   end
@@ -225,9 +218,7 @@ def response
         components {
           div do
             partial :my_simple_partial
-            br
             partial :my_partial_with_param, "foo"
-            br
             partial :my_partial_with_partial
           end
         }
@@ -274,14 +265,10 @@ def my_action
         some content
       </span>
 
-      <br/>
-
       <span id="my_partial_with_param">
         content with param: foo
       </span>
 
-      <br/>
-
       <span id="my_partial_with_partial">
 
         <span id="my_simple_partial">
@@ -316,7 +303,6 @@ def response
         components {
           div id: "my-component" do
             slot options[:my_first_slot]
-            br
             slot options[:my_second_slot]
           end
         }
@@ -379,7 +365,6 @@ def my_action
         <span id="my_simple_slot">
           some content
         </span>
-        <br/>
         <span id="my_simple_slot">
           foo from page
         </span>