Skip to content

Commit 4573b4f

Browse files
mehmeh
committedJan 22, 2014
spec: use the new expect style
·
v0.3.5v0.3.0
1 parent 33c0ed0 commit 4573b4f

14 files changed

+119
-110
lines changed
 

‎spec/dom/builder_spec.rb

+19-19
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22

33
describe Browser::DOM::Builder do
44
it 'builds an element' do
5-
DOM {
5+
expect(DOM {
66
div
7-
}.name.should == 'DIV'
7+
}.name).to eq('DIV')
88
end
99

1010
it 'builds an element with text content' do
11-
DOM {
11+
expect(DOM {
1212
div "foo bar"
13-
}.text.should == "foo bar"
13+
}.text).to eq('foo bar')
1414

15-
DOM {
15+
expect(DOM {
1616
div {
1717
"foo bar"
1818
}
19-
}.text.should == "foo bar"
19+
}.text).to eq('foo bar')
2020
end
2121

2222
it 'builds an element with attributes' do
23-
DOM {
23+
expect(DOM {
2424
div class: :wut
25-
}.class_name.should == :wut
25+
}.class_name).to eq(:wut)
2626
end
2727

2828
it 'builds deeper trees' do
@@ -34,15 +34,15 @@
3434
}
3535
}
3636

37-
res.name.should == 'DIV'
38-
res.child.name.should == 'SPAN'
39-
res.child.text.should == 'wut'
37+
expect(res.name).to eq('DIV')
38+
expect(res.child.name).to eq('SPAN')
39+
expect(res.child.text).to eq('wut')
4040
end
4141

4242
it 'sets classes with methods' do
43-
DOM {
43+
expect(DOM {
4444
div.nice.element
45-
}.class_names.should == %w[nice element]
45+
}.class_names).to eq(%w[nice element])
4646
end
4747

4848
it 'nests when setting classes' do
@@ -52,18 +52,18 @@
5252
}
5353
}
5454

55-
res.name.should == 'DIV'
56-
res.class_names.should == %w[nice element]
57-
res.child.name.should == 'SPAN'
58-
res.child.class_names.should == %w[nicer]
55+
expect(res.name).to eq('DIV')
56+
expect(res.class_names).to eq(%w[nice element])
57+
expect(res.child.name).to eq('SPAN')
58+
expect(res.child.class_names).to eq(%w[nicer])
5959
end
6060

6161
it 'joins class name properly' do
6262
res = DOM {
6363
i.icon[:legal]
6464
}
6565

66-
res.name.should == 'I'
67-
res.class_names.should == %w[icon-legal]
66+
expect(res.name).to eq('I')
67+
expect(res.class_names).to eq(%w[icon-legal])
6868
end
6969
end

‎spec/dom/document_spec.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
describe Browser::DOM::Document do
44
describe '#title' do
55
it 'should get the document title' do
6-
$document.title.should be_kind_of(String)
6+
expect($document.title).to be_a(String)
77
end
88
end
99

1010
describe '#title=' do
1111
it 'should set the document title' do
1212
old = $document.title
1313
$document.title = 'lol'
14-
$document.title.should == 'lol'
14+
expect($document.title).to eq('lol')
1515
$document.title = old
1616
end
1717
end
@@ -22,19 +22,19 @@
2222
HTML
2323

2424
it "should get element by id" do
25-
$document["lol"].should == `#{$document.to_n}.getElementById('lol')`
25+
expect($document["lol"]).to eq(`#{$document.to_n}.getElementById('lol')`)
2626
end
2727

2828
it "should get element by css" do
29-
$document["lol"].should == `#{$document.to_n}.getElementById('lol')`
29+
expect($document["lol"]).to eq(`#{$document.to_n}.getElementById('lol')`)
3030
end
3131

3232
it "should get element by xpath" do
33-
$document["//*[@id='lol']"].should == `#{$document.to_n}.getElementById('lol')`
33+
expect($document["//*[@id='lol']"]).to eq(`#{$document.to_n}.getElementById('lol')`)
3434
end
3535

3636
it "should return nil if it can't find anything" do
37-
$document["doo-dah"].should be_nil
37+
expect($document["doo-dah"]).to be_nil
3838
end
3939
end
4040
end

‎spec/dom/element_spec.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
HTML
88

99
it 'gets the proper id' do
10-
$document["lol"].id.should == 'lol'
10+
expect($document["lol"].id).to eq('lol')
1111
end
1212
end
1313

@@ -20,11 +20,11 @@
2020
HTML
2121

2222
it 'gives an empty array when no class is set' do
23-
$document["class-names-2"].class_names.should == []
23+
expect($document["class-names-2"].class_names).to eq([])
2424
end
2525

2626
it 'gives an array of class names' do
27-
$document["class-names-1"].class_names.should == %w[a b c]
27+
expect($document["class-names-1"].class_names).to eq(%w[a b c])
2828
end
2929
end
3030

@@ -36,11 +36,11 @@
3636
HTML
3737

3838
it 'matches on class and id' do
39-
$document[:matches].matches?('#matches.not.me').should be_truthy
39+
expect($document[:matches].matches?('#matches.not.me')).to be_truthy
4040
end
4141

4242
it 'matches on class and name' do
43-
$document[:matches].first_element_child.matches?('span.yes').should be_truthy
43+
expect($document[:matches].first_element_child.matches?('span.yes')).to be_truthy
4444
end
4545
end
4646
end

‎spec/dom/event_spec.rb

+16-16
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
count += 1
1717
end
1818

19-
count.should == 0
19+
expect(count).to eq(0)
2020
elem.trigger :click
21-
count.should == 1
21+
expect(count).to eq(1)
2222
elem.trigger :click
23-
count.should == 2
23+
expect(count).to eq(2)
2424
elem.trigger 'mouse:down'
25-
count.should == 2
25+
expect(count).to eq(2)
2626
end
2727

2828
it "listens for custom events" do
@@ -33,19 +33,19 @@
3333
count += 1
3434
end
3535

36-
count.should == 0
36+
expect(count).to eq(0)
3737
elem.trigger :huehue
38-
count.should == 1
38+
expect(count).to eq(1)
3939
elem.trigger :huehue
40-
count.should == 2
40+
expect(count).to eq(2)
4141
end
4242

4343
async "passes an event to the handler" do
4444
elem = $document["event-spec"]
4545

4646
elem.on :click do |event|
4747
run_async {
48-
event.should be_kind_of Browser::DOM::Event
48+
expect(event).to be_a(Browser::DOM::Event)
4949
}
5050
end
5151

@@ -57,9 +57,9 @@
5757

5858
elem.on :bazinga do |event, foo, bar, baz|
5959
run_async {
60-
foo.should == 1
61-
bar.should == 2
62-
baz.should == 3
60+
expect(foo).to eq(1)
61+
expect(bar).to eq(2)
62+
expect(baz).to eq(3)
6363
}
6464
end
6565

@@ -71,7 +71,7 @@
7171

7272
elem.on :bazinga, 'span.nami' do
7373
run_async {
74-
true.should be_truthy
74+
expect(true).to be_truthy
7575
}
7676
end
7777

@@ -97,11 +97,11 @@
9797
end
9898

9999
elem.trigger :click
100-
count.should == 2
100+
expect(count).to eq(2)
101101

102102
elem.off :click
103103
elem.trigger :click
104-
count.should == 2
104+
expect(count).to eq(2)
105105
end
106106

107107
it "removes only the passed handler" do
@@ -117,11 +117,11 @@
117117
end
118118

119119
elem.trigger :click
120-
count.should == 2
120+
expect(count).to eq(2)
121121

122122
cb.off
123123
elem.trigger :click
124-
count.should == 3
124+
expect(count).to eq(3)
125125
end
126126
end
127127
end

‎spec/dom/mutation_observer_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
async 'notifies additions' do
1111
obs = Browser::DOM::MutationObserver.new {|mutations|
1212
run_async {
13-
mutations.first.added.first.name.should == 'DIV'
13+
expect(mutations.first.added.first.name).to eq('DIV')
1414
}
1515

1616
obs.disconnect
@@ -24,7 +24,7 @@
2424
async 'notifies removals' do
2525
obs = Browser::DOM::MutationObserver.new {|mutations|
2626
run_async {
27-
mutations.first.removed.first.name.should == 'SPAN'
27+
expect(mutations.first.removed.first.name).to eq('SPAN')
2828
}
2929

3030
obs.disconnect

0 commit comments

Comments
 (0)
Please sign in to comment.