Update specs

spec/helpers/workload_helper_spec.rb

@@ -10,8 +10,6 @@
   it "should tooltip helper doesn't raise if a version doesn't have an associated version_load" do
     v = Version.find(1)
     assert_nil v.version_load
-    assert_nothing_raised do
-      h = workload_version_tooltip(v)
-    end
+    expect{workload_version_tooltip(v)}.to_not raise_error
   end
 end

spec/models/macros_spec.rb

@@ -34,7 +34,7 @@
 
     # second argument has no effect if its format is not correct
     workload_filter_with_incorrect_second_argument = textilizable("{{workload(#{@project.identifier}, wrongFormat>unknownTestValue)}}")
-    textilizable("{{workload(#{@project.identifier})}}").should == workload_filter_with_incorrect_second_argument
+    expect(textilizable("{{workload(#{@project.identifier})}}")).to eq workload_filter_with_incorrect_second_argument
   end
 
   it "should workload_by_issues macro" do
@@ -50,6 +50,6 @@
 
     # second argument has no effect if its format is not correct
     workload_filter_with_incorrect_second_argument = textilizable("{{workload_by_issues(#{@project.identifier}, wrongFormat>unknownTestValue)}}")
-    textilizable("{{workload_by_issues(#{@project.identifier})}}").should == workload_filter_with_incorrect_second_argument
+    expect(textilizable("{{workload_by_issues(#{@project.identifier})}}")).to eq workload_filter_with_incorrect_second_argument
   end
 end

spec/models/version_load_spec.rb

@@ -10,8 +10,8 @@
   end
 
   it "should #initialize" do
-    @workload.week_from.to_i.should == 200831
-    @workload.week_to.to_i.should == 200836
+    expect(@workload.week_from.to_i).to eq 200831
+    expect(@workload.week_to.to_i).to eq 200836
   end
 
   it "should #versions" do
@@ -24,13 +24,13 @@
 
   it "should #load_by_week" do
     expected = {200831=>2,200833=>1}
-    @workload.load_by_week.should == expected
+    expect(@workload.load_by_week).to eq expected
   end
 
   it "should Version#version_load_id is in Version#safe_attributes" do
     v = Version.new(:name => 'V1')
     v.safe_attributes = {'description' => 'final', 'version_load_id' => 2}
-    v.description.should == 'final' #ensures we don't break existing safe_attributes
-    v.version_load_id.should == 2
+    expect(v.description).to eq 'final' #ensures we don't break existing safe_attributes
+    expect(v.version_load_id).to eq 2
   end
 end

spec/models/week_spec.rb

@@ -3,46 +3,46 @@
 describe "Week" do
   it "should initialize correctly" do
     week = Week.new(2011,1)
-    week.year.should == 2011
-    week.cweek.should == 1
+    expect(week.year).to eq 2011
+    expect(week.cweek).to eq 1
     week = Week.new(Date.new(2011,1,3))
-    week.year.should == 2011
-    week.cweek.should == 1
+    expect(week.year).to eq 2011
+    expect(week.cweek).to eq 1
   end
 
   it "should be comparable" do
     week1 = Week.new(2011,1)
     week2 = Week.new(2011,2)
     week3 = Week.new(2012,1)
     sorted = [week1,week2,week3]
-    [week1,week3,week2].sort.should == sorted
-    [week3,week2,week1,week2].uniq.sort.should == sorted
+    expect([week1,week3,week2].sort).to eq sorted
+    expect([week3,week2,week1,week2].uniq.sort).to eq sorted
   end
 
   it "should allow + and - operations" do
     week1 = Week.new(2011,1)
     week2 = Week.new(2011,2)
     week3 = Week.new(2012,1)
-    (week1 + 1 - 1).should == week1
-    (week1 + 1).should == week2
-    (week1 + 52).should == week3
-    (week2 - 1).should == week1
-    (week3 - 52).should == week1
+    expect((week1 + 1 - 1)).to eq week1
+    expect((week1 + 1)).to eq week2
+    expect((week1 + 52)).to eq week3
+    expect((week2 - 1)).to eq week1
+    expect((week3 - 52)).to eq week1
   end
 
   it "should be iterable" do
     week = Week.new(2010,52)
-    week.succ.should == Week.new(2011,1)
-    week.succ.succ.should == Week.new(2011,2)
-    Week.new(2012,52).succ.should == Week.new(2013,1)
+    expect(week.succ).to eq Week.new(2011,1)
+    expect(week.succ.succ).to eq Week.new(2011,2)
+    expect(Week.new(2012,52).succ).to eq Week.new(2013,1)
   end
 
   it "should have an integer representation" do
-    Week.new(2010,1).to_i.should == 201001
-    Week.new(2010,31).to_i.should == 201031
+    expect( Week.new(2010,1).to_i).to eq 201001
+    expect(Week.new(2010,31).to_i).to eq 201031
   end
 
   it "should return this week for #today" do
-    Week.today.should == Week.new(Date.today)
+    expect(Week.today).to eq Week.new(Date.today)
   end
 end

spec/models/workload_spec.rb

@@ -11,16 +11,16 @@
 
   it "should Workload creation" do
     w = Workload.new
-    assert_not_nil w
-    Workload.display_weeks_before.should == 4
-    Workload.display_weeks_after.should == 16
-    w.week_from.should == Week.today - 4
-    w.week_to.should == Week.today + 16
+    refute_nil w
+    expect(Workload.display_weeks_before).to eq 4
+    expect(Workload.display_weeks_after).to eq 16
+    expect(w.week_from).to eq Week.today - 4
+    expect(w.week_to).to eq Week.today + 16
   end
 
   it "should Workload#versions" do
     w = Workload.new(:week_from => Week.new(2008,26), :week_to => Week.new(2008,31))
-    w.versions.length.should == 2
+    expect(w.versions.length).to eq 2
     assert_instance_of Version, w.versions.first
   end
 
@@ -32,25 +32,25 @@
 
   it "should Workload#projects" do
     w = Workload.new
-    w.projects.length.should == Project.count
+    expect(w.projects.length).to eq Project.count
     w = Workload.new(:project => @subproject)
-    w.projects.length.should == 1
+    expect(w.projects.length).to eq 1
   end
 
   it "should Workload#load_by_week" do
     w = Workload.new(:week_from => Week.new(2008,26), :week_to => Week.new(2008,31))
     expected = {200831=>2}
-    w.load_by_week.should == expected
+    expect(w.load_by_week).to eq expected
   end
 
   it "should Workload#weeks" do
     w = Workload.new(:week_from => Week.new(2008,26), :week_to => Week.new(2008,31))
-    w.weeks.map(&:cweek).should == [26,27,28,29,30,31]
+    expect(w.weeks.map(&:cweek)).to eq [26,27,28,29,30,31]
   end
 
   it "should Ensure Workload#each_week and Workload#weeks are coherent" do
     w = Workload.new
     a = []; w.each_week{|m| a << m}
-    a.should == w.weeks.to_a
+    expect(a).to eq w.weeks.to_a
   end
 end