Updated rspec to rspec 3.x syntax

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

1 files changed, 26 insertions, 26 deletions

diff --git a/spec/lib/gitlab/version_info_spec.rb b/spec/lib/gitlab/version_info_spec.rb
index 94dccf7a4e5..5afeb1c1ec3 100644
--- a/spec/lib/gitlab/version_info_spec.rb
+++ b/spec/lib/gitlab/version_info_spec.rb
@@ -12,58 +12,58 @@ describe 'Gitlab::VersionInfo', no_db: true do
   end
 
   context '>' do
-    it { @v2_0_0.should > @v1_1_0 }
-    it { @v1_1_0.should > @v1_0_1 }
-    it { @v1_0_1.should > @v1_0_0 }
-    it { @v1_0_0.should > @v0_1_0 }
-    it { @v0_1_0.should > @v0_0_1 }
+    it { expect(@v2_0_0).to be > @v1_1_0 }
+    it { expect(@v1_1_0).to be > @v1_0_1 }
+    it { expect(@v1_0_1).to be > @v1_0_0 }
+    it { expect(@v1_0_0).to be > @v0_1_0 }
+    it { expect(@v0_1_0).to be > @v0_0_1 }
   end
 
   context '>=' do
-    it { @v2_0_0.should >= Gitlab::VersionInfo.new(2, 0, 0) }
-    it { @v2_0_0.should >= @v1_1_0 }
+    it { expect(@v2_0_0).to be >= Gitlab::VersionInfo.new(2, 0, 0) }
+    it { expect(@v2_0_0).to be >= @v1_1_0 }
   end
 
   context '<' do
-    it { @v0_0_1.should < @v0_1_0 }
-    it { @v0_1_0.should < @v1_0_0 }
-    it { @v1_0_0.should < @v1_0_1 }
-    it { @v1_0_1.should < @v1_1_0 }
-    it { @v1_1_0.should < @v2_0_0 }
+    it { expect(@v0_0_1).to be < @v0_1_0 }
+    it { expect(@v0_1_0).to be < @v1_0_0 }
+    it { expect(@v1_0_0).to be < @v1_0_1 }
+    it { expect(@v1_0_1).to be < @v1_1_0 }
+    it { expect(@v1_1_0).to be < @v2_0_0 }
   end
 
   context '<=' do
-    it { @v0_0_1.should <= Gitlab::VersionInfo.new(0, 0, 1) }
-    it { @v0_0_1.should <= @v0_1_0 }
+    it { expect(@v0_0_1).to be <= Gitlab::VersionInfo.new(0, 0, 1) }
+    it { expect(@v0_0_1).to be <= @v0_1_0 }
   end
 
   context '==' do
-    it { @v0_0_1.should == Gitlab::VersionInfo.new(0, 0, 1) }
-    it { @v0_1_0.should == Gitlab::VersionInfo.new(0, 1, 0) }
-    it { @v1_0_0.should == Gitlab::VersionInfo.new(1, 0, 0) }
+    it { expect(@v0_0_1).to eq(Gitlab::VersionInfo.new(0, 0, 1)) }
+    it { expect(@v0_1_0).to eq(Gitlab::VersionInfo.new(0, 1, 0)) }
+    it { expect(@v1_0_0).to eq(Gitlab::VersionInfo.new(1, 0, 0)) }
   end
 
   context '!=' do
-    it { @v0_0_1.should_not == @v0_1_0 }
+    it { expect(@v0_0_1).not_to eq(@v0_1_0) }
   end
 
   context 'unknown' do
-    it { @unknown.should_not be @v0_0_1 }
-    it { @unknown.should_not be Gitlab::VersionInfo.new }
+    it { expect(@unknown).not_to be @v0_0_1 }
+    it { expect(@unknown).not_to be Gitlab::VersionInfo.new }
     it { expect{@unknown > @v0_0_1}.to raise_error(ArgumentError) }
     it { expect{@unknown < @v0_0_1}.to raise_error(ArgumentError) }
   end
 
   context 'parse' do
-    it { Gitlab::VersionInfo.parse("1.0.0").should == @v1_0_0 }
-    it { Gitlab::VersionInfo.parse("1.0.0.1").should == @v1_0_0 }
-    it { Gitlab::VersionInfo.parse("git 1.0.0b1").should == @v1_0_0 }
-    it { Gitlab::VersionInfo.parse("git 1.0b1").should_not be_valid }
+    it { expect(Gitlab::VersionInfo.parse("1.0.0")).to eq(@v1_0_0) }
+    it { expect(Gitlab::VersionInfo.parse("1.0.0.1")).to eq(@v1_0_0) }
+    it { expect(Gitlab::VersionInfo.parse("git 1.0.0b1")).to eq(@v1_0_0) }
+    it { expect(Gitlab::VersionInfo.parse("git 1.0b1")).not_to be_valid }
   end
 
   context 'to_s' do
-    it { @v1_0_0.to_s.should == "1.0.0" }
-    it { @unknown.to_s.should == "Unknown" }
+    it { expect(@v1_0_0.to_s).to eq("1.0.0") }
+    it { expect(@unknown.to_s).to eq("Unknown") }
   end
 end