update to rspec3

Author: Chris Busbey

Gemfile

@@ -4,9 +4,9 @@ gem "quickfix-jruby", "~>1.6.0"
 gem "anticipate"
 gem "cucumber", "~> 1.3"
 gem "fix_spec", "~> 0.4.1"
+gem "rspec", "~> 3.0"
 
 group :development do
   gem "jeweler", "~> 1.8.8"
-  gem "rspec", "~> 2.14"
   gem "rake", "~> 10.1"
 end

Gemfile.lock

@@ -12,7 +12,7 @@ GEM
       multi_test (>= 0.0.2)
     cuke_mem (0.1.1)
       cucumber (~> 1.3)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
     fix_spec (0.4.1)
@@ -64,14 +64,19 @@ GEM
     rake (10.1.0)
     rdoc (4.0.1)
       json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
 
 PLATFORMS
   java
@@ -83,4 +88,4 @@ DEPENDENCIES
   jeweler (~> 1.8.8)
   quickfix-jruby (~> 1.6.0)
   rake (~> 10.1)
-  rspec (~> 2.14)
+  rspec (~> 3.0)

features/step_definitions/steps.rb

@@ -8,10 +8,10 @@
 
 Given(/^my agents are logged on$/) do
   sleeping(AgentFIX.cucumber_sleep_seconds).seconds.between_tries.failing_after(AgentFIX.cucumber_retries).tries do
-    AgentFIX.agents_hash[:my_acceptor].loggedOn?.should be_true
-    AgentFIX.agents_hash[:my_initiator].loggedOn?.should be_true
-    AgentFIX.agents_hash[:my_fix50_acceptor].loggedOn?.should be_true
-    AgentFIX.agents_hash[:my_fix50_initiator].loggedOn?.should be_true
+    expect(AgentFIX.agents_hash[:my_acceptor].loggedOn?).to eq(true)
+    expect(AgentFIX.agents_hash[:my_initiator].loggedOn?).to eq(true)
+    expect(AgentFIX.agents_hash[:my_fix50_acceptor].loggedOn?).to eq(true)
+    expect(AgentFIX.agents_hash[:my_fix50_initiator].loggedOn?).to eq(true)
   end
 end
 
@@ -28,5 +28,5 @@
 
   reqID = quickfix.field.TestReqID.new
   @message.getField(reqID)
-  reqID.getValue.should ==(value)
+  expect(reqID.getValue).to eq(value)
 end

lib/agent_fix/cucumber.rb

@@ -49,9 +49,9 @@ def anticipate_fix
     messages = @agent.messages_received :since=>@agent.bookmark
 
     if exact
-      (messages.length).should be == count, "Expected exactly #{count} messages, but got #{messages.length}"
+      expect(messages.length).to eq(count), "Expected exactly #{count} messages, but got #{messages.length}"
     else
-      (messages.length).should be >= count, "Expected #{count} messages, but got #{messages.length}"
+      expect(messages.length).to be >= count, "Expected #{count} messages, but got #{messages.length}"
     end
 
     scope=messages.slice(0, count)
@@ -62,7 +62,7 @@ def anticipate_fix
       end
 
       scope.each do |msg|
-        msg[:message].header.get_string(35).should == type
+        expect(msg[:message].header.get_string(35)).to eq(type)
       end
     end
   end
@@ -96,8 +96,8 @@ def anticipate_fix
 When(/^I inspect the (\d+)(?:.*?)(?: FIX| fix)? message$/) do |index|
   index = index.to_i-1
 
-  @message_scope.should_not be_nil, "No message scope defined"
-  @message_scope.length.should be >index, "There are only #{@message_scope.length} messages in the scope"
+  expect(@message_scope).not_to be_nil, "No message scope defined"
+  expect(@message_scope.length).to be >index, "There are only #{@message_scope.length} messages in the scope"
   @message = @message_scope[index]
 end
 
@@ -116,7 +116,7 @@ def anticipate_fix
 end
 
 Then(/^the(?: FIX|fix)? messages should include(?: a message with)? the following:$/) do |table|
-  @message_scope.should_not be_nil, "No message scope defined"
+  expect(@message_scope).not_to be_nil, "No message scope defined"
 
   table_raw ="" 
   table.raw.each do |path, val|
@@ -141,6 +141,5 @@ def anticipate_fix
     index += 1
   end
 
-  found.should be_true, "Message not included in FIX messages\n #{error_accum}"
-
+  expect(found).to be(true), "Message not included in FIX messages\n #{error_accum}"
 end

spec/agent_fix/configuration_spec.rb

@@ -2,11 +2,11 @@
 
 describe AgentFIX::Configuration do
   it "inspects just app messages by default" do
-    AgentFIX.include_session_level?.should be_false
+    expect(AgentFIX.include_session_level?).to be(false)
   end
 
   it "can inspect both app and session level messages" do
     AgentFIX.include_session_level = true
-    AgentFIX.include_session_level?.should be_true
+    expect(AgentFIX.include_session_level?).to be(true)
   end
 end

spec/agent_fix/message_cache_spec.rb

@@ -8,9 +8,9 @@
     cache.add_message "3"
 
     msgs = cache.messages
-    msgs.should == ["1","2","3"]
+    expect(msgs).to eq(["1","2","3"])
 
     cache.clear!
-    msgs.should == ["1","2","3"]
+    expect(msgs).to eq(["1","2","3"])
   end
 end