Skip to content

Fixed Specs for CI #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 2, 2019
Merged

Fixed Specs for CI #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6d0b53
Update config.yml
jonasjabari May 2, 2019
7b98992
log test artifacts for debugging
jonasjabari May 2, 2019
cc0bd9c
removed failing br tags, fails on CI because CI chrome renders <br> i…
jonasjabari May 2, 2019
9b87efe
removed failing br tags, fails on CI because CI chrome renders <br> i…
jonasjabari May 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 0 additions & 6 deletions spec/usage/base/component_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,6 @@ def response
components {
div id: "my-component" do
slot @options[:my_first_slot]
br
slot @options[:my_second_slot]
end
}
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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>
Expand Down
15 changes: 0 additions & 15 deletions spec/usage/base/page_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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">
Expand All @@ -198,7 +192,6 @@ def my_action
</div>
HTML


expect(stripped(static_output)).to include(stripped(expected_static_output))

end
Expand All @@ -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
}
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -316,7 +303,6 @@ def response
components {
div id: "my-component" do
slot options[:my_first_slot]
br
slot options[:my_second_slot]
end
}
Expand Down Expand Up @@ -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>
Expand Down