Skip to content

Commit 88effec

Browse files
fix quote component && spec
1 parent f3076be commit 88effec

File tree

2 files changed

+39
-11
lines changed

2 files changed

+39
-11
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
%q{@tag_attributes}
2-
- if block_given?
2+
- if options[:text].nil? && block_given?
33
= yield
44
- else
55
= options[:text]

spec/usage/components/q_spec.rb

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,61 @@
11
require_relative "../../support/utils"
22
include Utils
33

4-
describe "Q Component", type: :feature, js: true do
4+
describe 'Q Component', type: :feature, js: true do
55

6-
it "Example 1" do
6+
it 'Example 1 - yield, no options[:text]' do
77

88
class ExamplePage < Matestack::Ui::Page
99

1010
def response
1111
components {
12-
#simple q
13-
q text: "A simple quote"
12+
# simple quote
13+
q do
14+
plain 'This is simple quote text'
15+
end
1416

15-
# enhanced q
16-
q id: 'my-id', class: 'my-class', cite: 'www.matestack.org/example' do
17-
plain 'This is a enhanced q with text'
17+
# enhanced quote
18+
q id: 'my-id', class: 'my-class', cite: 'this is a cite' do
19+
plain 'This is a enhanced quote with text'
1820
end
1921
}
2022
end
2123

2224
end
2325

24-
visit "/example"
26+
visit '/example'
27+
static_output = page.html
28+
29+
expected_static_output = <<~HTML
30+
<q>This is simple quote text</q>
31+
<q cite="this is a cite" id="my-id" class="my-class">This is a enhanced quote with text</q>
32+
HTML
33+
expect(stripped(static_output)).to include(stripped(expected_static_output))
34+
end
35+
36+
it 'Example 2 - render options[:text]' do
37+
38+
class ExamplePage < Matestack::Ui::Page
39+
40+
def response
41+
components {
42+
# simple quote
43+
q text: 'This is simple quote text'
44+
45+
# enhanced quote
46+
q id: 'my-id', class: 'my-class', cite: 'this is a cite', text: 'This is a enhanced quote with text'
47+
}
48+
end
49+
50+
end
51+
52+
visit '/example'
2553

2654
static_output = page.html
2755

2856
expected_static_output = <<~HTML
29-
<q>A simple quote</q>
30-
<q cite="www.matestack.org/example" id="my-id" class="my-class">This is a enhanced q with text</q>
57+
<q>This is simple quote text</q>
58+
<q cite="this is a cite" id="my-id" class="my-class">This is a enhanced quote with text</q>
3159
HTML
3260

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

0 commit comments

Comments
 (0)