Skip to content

Commit b128660

Browse files
committed
Convert [] specs to expect syntax
1 parent bbab643 commit b128660

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

spec/mysql2/result_spec.rb

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -101,41 +101,44 @@
101101
context "#[]" do
102102
it "should return results when accessed by [offset]" do
103103
result = @client.query "SELECT 1 AS col UNION SELECT 2 AS col"
104-
result[1].should eql({"col" => 2})
105-
result[0].should eql({"col" => 1})
104+
expect(result[1]).to eql({"col" => 2})
105+
expect(result[0]).to eql({"col" => 1})
106106
end
107107

108108
it "should return results when accessed by negative [offset]" do
109109
result = @client.query "SELECT 1 AS col UNION SELECT 2 AS col"
110-
result[-1].should eql({"col" => 2})
111-
result[-2].should eql({"col" => 1})
110+
expect(result[-1]).to eql({"col" => 2})
111+
expect(result[-2]).to eql({"col" => 1})
112112
end
113113

114114
it "should return array of results when accessed by [offset, count]" do
115115
result = @client.query "SELECT 1 AS col UNION SELECT 2 AS col"
116-
result[1, 1].should eql([{"col" => 2}])
117-
result[-2, 10].should eql([{"col" => 1}, {"col" => 2}])
116+
expect(result[1, 1]).to eql([{"col" => 2}])
117+
expect(result[-2, 10]).to eql([{"col" => 1}, {"col" => 2}])
118118
end
119119

120120
it "should return nil if we use too large [offset]" do
121121
result = @client.query "SELECT 1 AS col UNION SELECT 2 AS col"
122-
result[2].should be_nil
123-
result[200].should be_nil
122+
expect(result[2]).to be_nil
123+
expect(result[200]).to be_nil
124124
end
125125

126126
it "should return nil if we use too negative [offset]" do
127127
result = @client.query "SELECT 1 AS col UNION SELECT 2 AS col"
128-
result[-3].should be_nil
129-
result[-300].should be_nil
128+
expect(result[-3]).to be_nil
129+
expect(result[-300]).to be_nil
130130
end
131131

132132
it "should accept hash args in [offset, {:foo => bar}] and [offset, count, {:foo => bar}]" do
133133
result = @client.query "SELECT 1 AS col UNION SELECT 2 AS col"
134-
result[1, {:symbolize_keys => true}].should eql({:col => 2})
135-
result[1, 1, {:symbolize_keys => true}].should eql([{:col => 2}])
134+
expect(result[1, {:symbolize_keys => true}]).to eql({:col => 2})
135+
expect(result[1, 1, {:symbolize_keys => true}]).to eql([{:col => 2}])
136+
136137
# This syntax does not work in Ruby 1.8:
137-
# result[1, :symbolize_keys => true].should eql({:col => 2})
138-
# result[1, 1, :symbolize_keys => true].should eql([{:col => 2}])
138+
unless RUBY_VERSION =~ /1\.8/
139+
expect(result[1, :symbolize_keys => true]).to eql({:col => 2})
140+
expect(result[1, 1, :symbolize_keys => true]).to eql([{:col => 2}])
141+
end
139142
end
140143

141144
it "should throw an exception if we use an [offset] in streaming mode" do

0 commit comments

Comments
 (0)