Skip to content

Commit ae2e8bc

Browse files
committed
Return placeholder matchers as strings
1 parent b706292 commit ae2e8bc

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

lib/squcumber-postgres/support/matchers.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ def convert_mock_value(value)
126126

127127
formatted_new_value = case format
128128
when nil
129-
puts "NO FORMAT"
130129
modified_new_value.to_s
131130
when 'day', 'month', 'year'
132131
modified_new_value.send(format.to_sym)
@@ -137,9 +136,9 @@ def convert_mock_value(value)
137136
raise "Invalid date format provided: #{format}"
138137
end
139138

140-
formatted_new_value
139+
formatted_new_value.to_s
141140
else
142-
new_value
141+
new_value.to_s
143142
end
144143
end
145144
end

spec/squcumber-postgres/support/matchers_spec.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ module Squcumber
2727
expect(dummy_class.new.convert_mock_value('30 days from now')).to eql('2017-08-14')
2828
end
2929
it 'converts to day' do
30-
expect(dummy_class.new.convert_mock_value('10 days from now (as day)')).to eql(25)
30+
expect(dummy_class.new.convert_mock_value('10 days from now (as day)')).to eql('25')
3131
end
3232
it 'converts to month' do
33-
expect(dummy_class.new.convert_mock_value('30 days from now (as month)')).to eql(8)
33+
expect(dummy_class.new.convert_mock_value('30 days from now (as month)')).to eql('8')
3434
end
3535
it 'converts to year' do
36-
expect(dummy_class.new.convert_mock_value('30 days from now (as year)')).to eql(2017)
36+
expect(dummy_class.new.convert_mock_value('30 days from now (as year)')).to eql('2017')
3737
end
3838
it 'sets beginning of day' do
3939
expect(dummy_class.new.convert_mock_value('beginning of day 10 days from now')).to eql('2017-07-25')
@@ -57,13 +57,13 @@ module Squcumber
5757
expect(dummy_class.new.convert_mock_value('10 months from now')).to eql('2018-05-15')
5858
end
5959
it 'converts to day' do
60-
expect(dummy_class.new.convert_mock_value('10 months from now (as day)')).to eql(15)
60+
expect(dummy_class.new.convert_mock_value('10 months from now (as day)')).to eql('15')
6161
end
6262
it 'converts to month' do
63-
expect(dummy_class.new.convert_mock_value('10 months from now (as month)')).to eql(5)
63+
expect(dummy_class.new.convert_mock_value('10 months from now (as month)')).to eql('5')
6464
end
6565
it 'converts to year' do
66-
expect(dummy_class.new.convert_mock_value('10 months from now (as year)')).to eql(2018)
66+
expect(dummy_class.new.convert_mock_value('10 months from now (as year)')).to eql('2018')
6767
end
6868
it 'sets beginning of month' do
6969
expect(dummy_class.new.convert_mock_value('beginning of month 10 months from now')).to eql('2018-05-01')
@@ -87,13 +87,13 @@ module Squcumber
8787
expect(dummy_class.new.convert_mock_value('10 years from now')).to eql('2027-07-15')
8888
end
8989
it 'converts to day' do
90-
expect(dummy_class.new.convert_mock_value('10 years from now (as day)')).to eql(15)
90+
expect(dummy_class.new.convert_mock_value('10 years from now (as day)')).to eql('15')
9191
end
9292
it 'converts to month' do
93-
expect(dummy_class.new.convert_mock_value('10 years from now (as month)')).to eql(7)
93+
expect(dummy_class.new.convert_mock_value('10 years from now (as month)')).to eql('7')
9494
end
9595
it 'converts to year' do
96-
expect(dummy_class.new.convert_mock_value('10 years from now (as year)')).to eql(2027)
96+
expect(dummy_class.new.convert_mock_value('10 years from now (as year)')).to eql('2027')
9797
end
9898
it 'sets beginning of year' do
9999
expect(dummy_class.new.convert_mock_value('beginning of year 10 months from now')).to eql('2018-01-01')

0 commit comments

Comments
 (0)