spec/citeproc/date_spec.rb in citeproc-1.0.1 vs spec/citeproc/date_spec.rb in citeproc-1.0.2

- old
+ new

@@ -8,92 +8,92 @@ it { should_not be_nil } it { should be_empty } describe 'sorting' do it 'treats [2003] as less than [2003,1]' do - DateParts.new(2003).should be < DateParts.new(2003,1) + expect(DateParts.new(2003)).to be < DateParts.new(2003,1) end it 'treats [1992,9,23] as less than [1993,8,22]' do - DateParts.new(1992,9,23).should be < DateParts.new(1993,8,22) + expect(DateParts.new(1992,9,23)).to be < DateParts.new(1993,8,22) end it 'treats [1992,9,23] as less than [1992,10,22]' do - DateParts.new(1992,9,23).should be < DateParts.new(1992,10,22) + expect(DateParts.new(1992,9,23)).to be < DateParts.new(1992,10,22) end it 'treats [1992,9,23] as less than [1992,9,24]' do - DateParts.new(1992,9,23).should be < DateParts.new(1992,9,24) + expect(DateParts.new(1992,9,23)).to be < DateParts.new(1992,9,24) end it 'treats [-50] as less than [-25]' do - DateParts.new(-50).should be < DateParts.new(-25) + expect(DateParts.new(-50)).to be < DateParts.new(-25) end it 'treats [-50] as less than [-50,12]' do - DateParts.new(-50).should be < DateParts.new(-50,12) + expect(DateParts.new(-50)).to be < DateParts.new(-50,12) end it 'treats [1994,1,23] as less than today' do - DateParts.new(1994,1,23).should be < ::Date.today + expect(DateParts.new(1994,1,23)).to be < ::Date.today end end describe '#dup' do let(:date) { DateParts.new(1991,8,22) } it 'creates a copy that contains the same parts' do - date.dup.to_a.should == [1991,8,22] + expect(date.dup.to_a).to eq([1991,8,22]) end it 'does not return self' do - date.dup.should_not equal(date) - date.dup.should == date + expect(date.dup).not_to equal(date) + expect(date.dup).to eq(date) end end describe '#update' do it 'accepts a hash' do - DateParts.new.update(:month => 2, :year => 80).to_a.should == [80,2,nil] + expect(DateParts.new.update(:month => 2, :year => 80).to_a).to eq([80,2,nil]) end it 'accepts an array' do - DateParts.new.update([80,2]).to_a.should == [80,2,nil] + expect(DateParts.new.update([80,2]).to_a).to eq([80,2,nil]) end end describe '#strftime' do it 'formats the date parts according to the format string' do - DateParts.new(1998,2,4).strftime('FOO %0m%0d%y').should == 'FOO 020498' + expect(DateParts.new(1998,2,4).strftime('FOO %0m%0d%y')).to eq('FOO 020498') end end describe 'to_citeproc' do it 'returns an empty list by default' do - DateParts.new.to_citeproc.should == [] + expect(DateParts.new.to_citeproc).to eq([]) end it 'returns a list with the year if only the year is set' do - DateParts.new(2001).to_citeproc.should == [2001] + expect(DateParts.new(2001).to_citeproc).to eq([2001]) end it 'supports zero parts' do - DateParts.new(0,0).to_citeproc.should == [0,0] + expect(DateParts.new(0,0).to_citeproc).to eq([0,0]) end end describe '#open?' do it 'returns false by default' do - DateParts.new.should_not be_open + expect(DateParts.new).not_to be_open end it 'returns false for [1999,8,24]' do - DateParts.new(1999, 8, 24).should_not be_open + expect(DateParts.new(1999, 8, 24)).not_to be_open end it 'returns true for [0]' do - DateParts.new(0).should be_open + expect(DateParts.new(0)).to be_open end end end end @@ -111,97 +111,97 @@ it { should_not be_numeric } describe '.new' do it 'accepts a hash as input' do - Date.new(:literal => 'Summer').to_s.should == 'Summer' + expect(Date.new(:literal => 'Summer').to_s).to eq('Summer') end it 'accepts a hash as input and converts date parts' do - Date.new(:'date-parts' => [[2003,2]]).parts[0].should be_a(Date::DateParts) + expect(Date.new(:'date-parts' => [[2003,2]]).parts[0]).to be_a(Date::DateParts) end it 'accepts a fixnum and treats it as the year' do - Date.new(1666).year.should == 1666 + expect(Date.new(1666).year).to eq(1666) end it 'accepts a date' do - Date.new(::Date.new(1980,4)).month.should == 4 + expect(Date.new(::Date.new(1980,4)).month).to eq(4) end it 'accepts a date and creates date parts' do - Date.new(::Date.new(1980,4)).parts[0].to_citeproc.should == [1980,4,1] + expect(Date.new(::Date.new(1980,4)).parts[0].to_citeproc).to eq([1980,4,1]) end it 'is empty by default' do - Date.new.should be_empty + expect(Date.new).to be_empty end it 'accepts date strings' do - Date.new('2009-03-19').day.should == 19 + expect(Date.new('2009-03-19').day).to eq(19) end it 'accepts JSON strings' do - Date.new('{ "date-parts": [[2001,1,19]]}').day.should == 19 + expect(Date.new('{ "date-parts": [[2001,1,19]]}').day).to eq(19) end it 'accepts date parts in an array' do - Date.new([2009,3]).month.should == 3 + expect(Date.new([2009,3]).month).to eq(3) end it 'accepts ranges as an array' do - Date.new([[2009],[2012]]).should be_range + expect(Date.new([[2009],[2012]])).to be_range end it 'accepts year ranges' do - Date.new(2009..2012).should be_range + expect(Date.new(2009..2012)).to be_range end it 'accepts exclusive date ranges' do - Date.new(::Date.new(2009) ... ::Date.new(2011)).end_date.year.should == 2010 + expect(Date.new(::Date.new(2009) ... ::Date.new(2011)).end_date.year).to eq(2010) end it 'accepts inclusive date ranges' do - Date.new(::Date.new(2009) .. ::Date.new(2011)).end_date.year.should == 2011 + expect(Date.new(::Date.new(2009) .. ::Date.new(2011)).end_date.year).to eq(2011) end it 'accepts EDTF date strings' do - Date.new('2009?-03-19').should be_uncertain + expect(Date.new('2009?-03-19')).to be_uncertain end it 'accepts EDTF intervals' do - Date.new('2009-03-19/2010-11-21').parts.map(&:to_citeproc).should == [[2009,3,19],[2010,11,21]] + expect(Date.new('2009-03-19/2010-11-21').parts.map(&:to_citeproc)).to eq([[2009,3,19],[2010,11,21]]) end end describe '.parse' do it 'returns nil by default' do - Date.parse('').should be nil - Date.parse(nil).should be nil + expect(Date.parse('')).to be nil + expect(Date.parse(nil)).to be nil end it 'parses date strings' do - Date.parse('2004-10-26').year.should == 2004 + expect(Date.parse('2004-10-26').year).to eq(2004) end end describe '.create' do it 'should accept parameters and return a new instance' do - Date.create('date-parts' => [[2001, 1]]).year.should == 2001 + expect(Date.create('date-parts' => [[2001, 1]]).year).to eq(2001) end end describe '#dup' do let(:date) { Date.new([1991,8]) } it 'creates a copy that contains the same parts' do - date.dup.parts.map(&:to_citeproc).should == [[1991,8]] + expect(date.dup.parts.map(&:to_citeproc)).to eq([[1991,8]]) end it 'copies uncertainty' do - date.dup.should_not be_uncertain - date.uncertain!.dup.should be_uncertain + expect(date.dup).not_to be_uncertain + expect(date.uncertain!.dup).to be_uncertain end it 'makes a deep copy of attributes' do expect { date.dup.uncertain! }.not_to change { date.uncertain? } end @@ -209,99 +209,99 @@ it 'makes a deep copy of date parts' do expect { date.dup.parts[0].update(:year => 2012) }.not_to change { date.year } end it 'does not return self' do - date.dup.should_not equal(date) - date.dup.should == date + expect(date.dup).not_to equal(date) + expect(date.dup).to eq(date) end end describe 'literal dates' do it 'is not literal by default' do - Date.new.should_not be_literal + expect(Date.new).not_to be_literal end it 'is literal if it contains only a literal field' do - Date.create(:literal => 'foo').should be_literal + expect(Date.create(:literal => 'foo')).to be_literal end it 'is literal if it contains a literal field' do - Date.create('date-parts' => [[2000]], :literal => 'foo').should be_literal + expect(Date.create('date-parts' => [[2000]], :literal => 'foo')).to be_literal end end describe 'seasons' do it 'is no season by default' do - Date.new.should_not be_season + expect(Date.new).not_to be_season end it 'is a season if contains only a season field' do - Date.new(:season => 'Winter').should be_season + expect(Date.new(:season => 'Winter')).to be_season end it 'is a season if contains a season field' do - Date.new(:'date-parts' => [[2001]], :season => 'Winter').should be_season + expect(Date.new(:'date-parts' => [[2001]], :season => 'Winter')).to be_season end end describe 'uncertain dates' do it 'are uncertain' do - Date.new({ 'date-parts' => [[-225]], 'circa' => '1' }).should be_uncertain - Date.new { |d| d.parts = [[-225]]; d.uncertain! }.should_not be_certain + expect(Date.new({ 'date-parts' => [[-225]], 'circa' => '1' })).to be_uncertain + expect(Date.new { |d| d.parts = [[-225]]; d.uncertain! }).not_to be_certain end describe '#(un)certain!' do it 'returns self' do - ad2k.uncertain!.should equal(ad2k) - ad2k.certain!.should equal(ad2k) + expect(ad2k.uncertain!).to equal(ad2k) + expect(ad2k.certain!).to equal(ad2k) end end end describe 'sorting' do it 'dates with more date-parts will come after those with fewer parts' do - (ad2k < may && may < first_of_may).should be true + expect(ad2k < may && may < first_of_may).to be true end it 'negative years are sorted inversely' do - [ad50, bc100, bc50, ad100].sort.map(&:year).should == [-100, -50, 50, 100] + expect([ad50, bc100, bc50, ad100].sort.map(&:year)).to eq([-100, -50, 50, 100]) end it 'can be compared to dates' do - ad50.should be < ::Date.new(50,2) - ad50.should be > ::Date.new(49) + expect(ad50).to be < ::Date.new(50,2) + expect(ad50).to be > ::Date.new(49) end end describe '#start_date' do it 'returns nil by default' do - Date.new.start_date.should be_nil + expect(Date.new.start_date).to be_nil end it 'returns a ruby date when date-parts are set' do - Date.new(1999).start_date.year.should == 1999 + expect(Date.new(1999).start_date.year).to eq(1999) end end describe '#end_date' do it 'returns nil by default' do - Date.new.end_date.should be_nil + expect(Date.new.end_date).to be_nil end it 'returns nil when there is a single date-parts set' do - Date.new(1312).end_date.should be_nil + expect(Date.new(1312).end_date).to be_nil end it 'returns a ruby date when date-parts are a closed range' do - Date.new(1999..2000).end_date.year.should == 2000 + expect(Date.new(1999..2000).end_date.year).to eq(2000) end end describe '#-@' do it 'inverts the year' do - (-ad50).should == bc50 + expect(-ad50).to eq(bc50) end end describe '#display' do it 'returns an empty string by default' do @@ -310,115 +310,115 @@ end describe 'b.c. and a.d.' do it 'the year 993 is a.d.' do - Date.new(993).should be_ad + expect(Date.new(993)).to be_ad end it 'the year 1000 is not a.d.' do - Date.new(1000).should_not be_ad + expect(Date.new(1000)).not_to be_ad end it 'the year 993 is not b.c.' do - Date.new(993).should_not be_bc + expect(Date.new(993)).not_to be_bc end it 'the year 0 is a.d.' do - Date.new(0).should be_ad + expect(Date.new(0)).to be_ad end it 'the year 0 is not b.c.' do - Date.new(0).should_not be_bc + expect(Date.new(0)).not_to be_bc end it 'the year -33 is not a.d.' do - Date.new(-33).should_not be_ad + expect(Date.new(-33)).not_to be_ad end it 'the year -33 is b.c.' do - Date.new(-33).should be_bc + expect(Date.new(-33)).to be_bc end it 'today is not a.d.' do - Date.today.should_not be_ad + expect(Date.today).not_to be_ad end it 'today is not b.c.' do - Date.today.should_not be_bc + expect(Date.today).not_to be_bc end it 'the year 2000 is not a.d.' do - ad2k.should_not be_ad + expect(ad2k).not_to be_ad end end describe '#empty?' do it 'returns true by default' do - Date.new.should be_empty + expect(Date.new).to be_empty end it 'returns true when it contains no date parts' do - Date.new({}).should be_empty + expect(Date.new({})).to be_empty end it 'returns false for today' do - Date.today.should_not be_empty + expect(Date.today).not_to be_empty end it 'returns false for literal dates' do - Date.new(:literal => 'foo').should_not be_empty + expect(Date.new(:literal => 'foo')).not_to be_empty end it 'returns false for seasons' do - Date.new(:season => 'Summer').should_not be_empty + expect(Date.new(:season => 'Summer')).not_to be_empty end end describe '#to_json' do it 'supports simple parts' do - Date.new(%w{2000 1 15}).to_json.should == '{"date-parts":[[2000,1,15]]}' + expect(Date.new(%w{2000 1 15}).to_json).to eq('{"date-parts":[[2000,1,15]]}') end it 'supports string parts' do - Date.new(['2000', '1', '15']).to_json.should == '{"date-parts":[[2000,1,15]]}' + expect(Date.new(['2000', '1', '15']).to_json).to eq('{"date-parts":[[2000,1,15]]}') end it 'supports integer parts' do - Date.new([2000, 1, 15]).to_json.should == '{"date-parts":[[2000,1,15]]}' + expect(Date.new([2000, 1, 15]).to_json).to eq('{"date-parts":[[2000,1,15]]}') end it 'supports mixed parts' do - Date.new(['2000', 1, '15']).to_json.should == '{"date-parts":[[2000,1,15]]}' + expect(Date.new(['2000', 1, '15']).to_json).to eq('{"date-parts":[[2000,1,15]]}') end it 'supports negative years' do - Date.new(-200).to_json.should == '{"date-parts":[[-200]]}' + expect(Date.new(-200).to_json).to eq('{"date-parts":[[-200]]}') end it 'treats seasons as a strings' do - Date.create({:season => '1', 'date-parts' => [[1950]]}).to_json.should =~ /"season":"1"/ + expect(Date.create({:season => '1', 'date-parts' => [[1950]]}).to_json).to match(/"season":"1"/) end it 'supports seasons' do - Date.create({:season => 'Trinity', 'date-parts' => [[1975]]}).to_json.should =~ /"season":"Trinity"/ + expect(Date.create({:season => 'Trinity', 'date-parts' => [[1975]]}).to_json).to match(/"season":"Trinity"/) end it 'supports string literals' do - Date.new(:literal => '13th century').to_json.should == '{"literal":"13th century"}' + expect(Date.new(:literal => '13th century').to_json).to eq('{"literal":"13th century"}') end it 'supports raw strings' do - Date.new(:raw => '23 May 1955').to_json.should == '{"date-parts":[[1955,5,23]]}' + expect(Date.new(:raw => '23 May 1955').to_json).to eq('{"date-parts":[[1955,5,23]]}') end it 'supports closed ranges' do - Date.new([[2000,11],[2000,12]]).to_json.should == '{"date-parts":[[2000,11],[2000,12]]}' + expect(Date.new([[2000,11],[2000,12]]).to_json).to eq('{"date-parts":[[2000,11],[2000,12]]}') end it 'supports open ranges' do - Date.new([[2000,11],[0,0]]).to_json.should == '{"date-parts":[[2000,11],[0,0]]}' + expect(Date.new([[2000,11],[0,0]]).to_json).to eq('{"date-parts":[[2000,11],[0,0]]}') end end end end