ib-ruby 0.7.6 → 0.7.8

data/spec/ib-ruby/models/order_spec.rb

@@ -3,15 +3,15 @@ require 'model_helper'
 describe IB::Models::Order do
 
   let(:props) do
-    {:order_id => 23,
+    {:local_id => 23,
      :order_ref => 'Test',
      :client_id => 1111,
      :perm_id => 173276893,
      :parent_id => 0,
      :side => :buy,
      :order_type => :market_if_touched,
-     :limit_price => 0.01,
-     :total_quantity => 100,
+     :limit_price => 0.1,
+     :quantity => 100,
      :tif => :good_till_cancelled,
      :open_close => :close,
      :oca_group => '',
@@ -20,8 +20,6 @@ describe IB::Models::Order do
      :designated_location => "WHATEVER",
      :exempt_code => 123,
      :delta_neutral_order_type => :market,
-     #:commission_currency => "USD",
-     #:status => 'PreSubmitted',
      :transmit => false,
      :outside_rth => true,
      :what_if => true,
@@ -30,64 +28,128 @@ describe IB::Models::Order do
 
   # TODO: :presents => { Object => "Formatted"}
   let(:human) do
-    "<Order: Test MIT GTC buy 100 New 0.01 #23/173276893 from 1111>"
-  end
-
-  let(:defaults) do
-    {:outside_rth => false,
-     :open_close => :open,
-     :short_sale_slot => :default,
-     :tif => :day,
-     :order_type => :limit,
-     :origin => :customer,
-     :transmit => true,
-     :designated_location => '',
-     :exempt_code => -1,
-     :what_if => false,
-     :not_held => false,
-     :status => 'New',
-     :created_at => Time,
-    }
+    "<Order: Test MIT GTC buy 100 New 0.1 #23/173276893 from 1111>"
   end
 
   let(:errors) do
-    {:side =>["should be buy/sell/short"],
-     :order_id => ["is not a number"], }
+    {:side =>["should be buy/sell/short"]}
   end
 
   let(:assigns) do
     {[:order_type, :delta_neutral_order_type] => codes_and_values_for(:order_type),
+
      :open_close =>
-         {['SAME', 'same', 'S', 's', :same, 0, '0'] => :same,
+         {[42, nil, 'Foo', :bar] => /should be same.open.close.unknown/,
+          ['SAME', 'same', 'S', 's', :same, 0, '0'] => :same,
           ['OPEN', 'open', 'O', 'o', :open, 1, '1'] => :open,
           ['CLOSE', 'close', 'C', 'c', :close, 2, '2'] => :close,
           ['UNKNOWN', 'unknown', 'U', 'u', :unknown, 3, '3'] => :unknown,
-          [42, nil, 'Foo', :bar] => /should be same.open.close.unknown/},
-
-     :side =>
-         {['BOT', 'BUY', 'Buy', 'buy', :BUY, :BOT, :Buy, :buy, 'B', :b] => :buy,
-          ['SELL', 'SLD', 'Sel', 'sell', :SELL, :SLD, :Sell, :sell, 'S', :S] => :sell,
-          ['SSHORT', 'Short', 'short', :SHORT, :short, 'T', :T] => :short,
-          ['SSHORTX', 'Shortextemt', 'shortx', :short_exempt, 'X', :X] => :short_exempt,
-          [1, nil, 'ASK', :foo] => /should be buy.sell.short/, },
-
-     [:what_if, :not_held, :outside_rth, :hidden, :transmit, :block_order, :sweep_to_fill,
-      :override_percentage_constraints, :all_or_none, :etrade_only, :firm_quote_only,
-      :opt_out_smart_routing, :scale_auto_reset, :scale_random_percent
-     ] => {[1, true] => true, [0, false] => false},
+         },
+
+     [:what_if, :not_held, :outside_rth, :hidden, :transmit, :block_order,
+      :sweep_to_fill, :override_percentage_constraints, :all_or_none,
+      :etrade_only, :firm_quote_only, :opt_out_smart_routing, :scale_auto_reset,
+      :scale_random_percent] => boolean_assigns,
+    }
+  end
+
+  let(:aliases) do
+    {[:side, :action] => buy_sell_short_assigns,
+     [:local_id, :order_id] => numeric_or_nil_assigns,
+     [:quantity, :total_quantity] => numeric_or_nil_assigns,
+    }
+  end
+
+  let(:associations) do
+    {:order_states => [IB::OrderState.new(:status => :Foo),
+                       IB::OrderState.new(:status => 'Bar'),],
+
+     :executions => [IB::Execution.new(:local_id => 23,
+                                       :client_id => 1111,
+                                       :perm_id => 173276893,
+                                       :exchange => "IDEALPRO",
+                                       :exec_id => "0001f4e8.4f5d48f1.01.01",
+                                       :price => 0.1,
+                                       :average_price => 0.1,
+                                       :shares => 40,
+                                       :cumulative_quantity => 40,
+                                       :side => :buy,
+                                       :time => "20120312  15:41:09"),
+                     IB::Execution.new(:local_id => 23,
+                                       :client_id => 1111,
+                                       :perm_id => 173276893,
+                                       :exchange => "IDEALPRO",
+                                       :exec_id => "0001f4e8.4f5d48f1.01.02",
+                                       :price => 0.1,
+                                       :average_price => 0.1,
+                                       :shares => 60,
+                                       :cumulative_quantity => 100,
+                                       :side => :buy,
+                                       :time => "20120312  15:41:10")]
     }
   end
 
   it_behaves_like 'Model'
   it_behaves_like 'Self-equal Model'
 
+  context 'Order associations' do
+    after(:all) { DatabaseCleaner.clean }
+
+    subject { IB::Order.new props }
+
+    it 'has order_states collection' do
+      subject.order_states.should_not be_nil
+      subject.order_states.should be_an Array # lies, it's more like association proxy
+    end
+
+    it 'has at least one (initial, New) OrderState' do
+      subject.order_states.should have_exactly(1).state
+      last_state = subject.order_states.last
+      last_state.should be_an IB::OrderState
+      last_state.status.should == 'New'
+      subject.save
+      last_state.order.should == subject if IB::DB
+    end
+
+    it 'has abbreviated accessor to last (current) OrderState' do
+      subject.order_state.should == subject.order_states.last
+    end
+
+    it 'has extra accessors to OrderState properties' do
+      subject.order_state.should_not be_nil
+      subject.status.should == 'New'
+    end
+
+    context 'update Order state by ' do
+
+      it 'either adding new State to order_states ' do
+        subject.order_states << IB::OrderState.new(:status => :Foo)
+        subject.order_states.push IB::OrderState.new :status => :Bar
+
+        subject.status.should == 'Bar'
+        subject.save
+        subject.order_states.should have_exactly(3).states
+        subject.order_states.first.order.should == subject if IB::DB
+      end
+
+      it 'or simply assigning to order_state accessor' do
+        subject.order_state = :Foo
+        subject.order_state = IB::OrderState.new :status => :Bar
+
+        subject.status.should == 'Bar'
+        subject.order_states.should have_exactly(3).states
+      end
+    end
+
+  end
+
   context 'equality' do
     subject { IB::Order.new props }
 
     it_behaves_like 'Self-equal Model'
 
     it 'is not equal for Orders with different limit price' do
-      order1 = IB::Order.new :total_quantity => 100,
+      order1 = IB::Order.new :quantity => 100,
                              :limit_price => 1,
                              :action => 'BUY'
 
@@ -99,7 +161,7 @@ describe IB::Models::Order do
     end
 
     it 'is not equal for Orders with different total_quantity' do
-      order1 = IB::Order.new :total_quantity => 20000,
+      order1 = IB::Order.new :quantity => 20000,
                              :limit_price => 1,
                              :action => 'BUY'
 
@@ -111,11 +173,11 @@ describe IB::Models::Order do
     end
 
     it 'is not equal for Orders with different action/side' do
-      order1 = IB::Order.new :total_quantity => 100,
+      order1 = IB::Order.new :quantity => 100,
                              :limit_price => 1,
                              :action => 'SELL'
 
-      order2 = IB::Order.new :total_quantity => 100,
+      order2 = IB::Order.new :quantity => 100,
                              :action => 'BUY',
                              :limit_price => 1
       order1.should_not == order2
@@ -123,12 +185,12 @@ describe IB::Models::Order do
     end
 
     it 'is not equal for Orders with different order_type' do
-      order1 = IB::Order.new :total_quantity => 100,
+      order1 = IB::Order.new :quantity => 100,
                              :limit_price => 1,
                              :action => 'BUY',
                              :order_type => 'LMT'
 
-      order2 = IB::Order.new :total_quantity => 100,
+      order2 = IB::Order.new :quantity => 100,
                              :action => 'BUY',
                              :limit_price => 1,
                              :order_type => 'MKT'

data/spec/ib-ruby/models/order_state_spec.rb

@@ -3,7 +3,7 @@ require 'model_helper'
 describe IB::Models::OrderState do
 
   let(:props) do
-    {:order_id => 23,
+    {:local_id => 23,
      :perm_id => 173276893,
      :client_id => 1111,
      :parent_id => 0,
@@ -30,22 +30,22 @@ describe IB::Models::OrderState do
     "<OrderState: PreSubmitted #23/173276893 from 1111 filled 3/2 at 0.5/0.55 margin 500.0/500.0 equity 750.0 fee 1.2 why_held child warning Oh noes!>"
   end
 
-  let(:defaults) do
-    {:created_at => Time,
+  let(:errors) do
+    {:status => ["must not be empty"],
     }
   end
 
-  let(:errors) do
-    {:order_id => ["is not a number"],
-     :client_id => ["is not a number"],
-     :perm_id => ["is not a number"], }
+  let(:assigns) do
+    {[:status] =>
+         {[nil, ''] => /must not be empty/,
+          ['Zorro', :Zorro] => 'Zorro' }
+    }
   end
 
-  let(:assigns) do
-    {   :tester => {1 => 1},
-        [:order_id, :perm_id, :client_id] =>
-         {[:foo, 'bar'] => /is not a number/,
-          [5.0, 2006.17] => /must be an integer/, }
+  let(:aliases) do
+    {[:local_id, :order_id] => numeric_or_nil_assigns,
+     [:price, :last_fill_price] => float_or_nil_assigns,
+     [:average_price, :average_fill_price] => float_or_nil_assigns,
     }
   end
 

data/spec/ib-ruby/models/underlying_spec.rb

@@ -0,0 +1,36 @@
+require 'model_helper'
+
+describe IB::Models::Underlying do # AKA IB::Underlying
+
+  let(:props) do
+    {:con_id => 234567,
+     :delta => 0.55,
+     :price => 20.5,
+    }
+  end
+
+  let(:human) do
+    /<Underlying: con_id: 234567 .*delta: 0.55 price: 20.5.*>/
+  end
+
+  let(:errors) do
+    {:delta => ['is not a number'],
+     :price => ['is not a number'],
+    }
+  end
+
+  let(:assigns) do
+    {[:con_id, :delta, :price] => numeric_assigns,
+    }
+  end
+
+  it_behaves_like 'Model'
+  it_behaves_like 'Self-equal Model'
+
+  context 'using shortest class name without properties' do
+    subject { IB::Underlying.new }
+    it_behaves_like 'Model instantiated empty'
+    it_behaves_like 'Self-equal Model'
+  end
+
+end # describe IB::Contract

data/spec/integration/contract_info_spec.rb

@@ -16,6 +16,8 @@ describe "Request Contract Info", :connected => true, :integration => true do
       @contract = IB::Contract.new :symbol => 'AAPL', :sec_type => :stock
       @ib.send_message :RequestContractData, :id => 111, :contract => @contract
       @ib.wait_for :ContractDataEnd, 3 # sec
+      # java: 15:33:16:159 <- 9-6-111-0-AAPL-STK--0.0---     ---0-- -
+      # ruby: 15:36:15:736 <- 9-6-111-0-AAPL-STK--0.0---SMART--- --0-
     end
 
     after(:all) { clean_connection } # Clear logs and message collector
@@ -34,24 +36,26 @@ describe "Request Contract Info", :connected => true, :integration => true do
 
       @ib.received[:ContractData].each do |msg|
         contract = msg.contract
-        contract.symbol.should == 'AAPL'
+        detail = msg.contract_detail
 
+        contract.symbol.should == 'AAPL'
         contract.local_symbol.should =~ /AAPL|APC/
-        contract.market_name.should =~ /NMS|USSTARS/
-        contract.trading_class.should =~ /NMS|USSTARS/
-        contract.long_name.should == 'APPLE INC'
-        contract.industry.should == 'Technology'
-        contract.category.should == 'Computers'
-        contract.subcategory.should == 'Computers'
-        contract.exchange.should == 'SMART'
         contract.con_id.should be_an Integer
-        contract.trading_hours.should =~ /\d{8}:\d{4}-\d{4}/
-        contract.liquid_hours.should =~ /\d{8}:\d{4}-\d{4}/
-        contract.valid_exchanges.should =~ /ISLAND|IBIS/
-        contract.order_types.should be_a String
-        contract.price_magnifier.should == 1
-        contract.min_tick.should be <= 0.01
         contract.expiry.should == ''
+        contract.exchange.should == 'SMART'
+
+        detail.market_name.should =~ /NMS|USSTARS/
+        detail.trading_class.should =~ /NMS|USSTARS/
+        detail.long_name.should == 'APPLE INC'
+        detail.industry.should == 'Technology'
+        detail.category.should == 'Computers'
+        detail.subcategory.should == 'Computers'
+        detail.trading_hours.should =~ /\d{8}:\d{4}-\d{4}/
+        detail.liquid_hours.should =~ /\d{8}:\d{4}-\d{4}/
+        detail.valid_exchanges.should =~ /ISLAND|IBIS/
+        detail.order_types.should be_a String
+        detail.price_magnifier.should == 1
+        detail.min_tick.should be <= 0.01
       end
     end
   end # Stock
@@ -60,9 +64,9 @@ describe "Request Contract Info", :connected => true, :integration => true do
 
     before(:all) do
       @contract = IB::Option.new :symbol => "AAPL", :expiry => "201301",
-                                 :right => "CALL", :strike => 500
+                                 :right => :call, :strike => 500
       @ib.send_message :RequestContractData, :id => 123, :contract => @contract
-      @ib.wait_for :ContractDataEnd, 3 # sec
+      @ib.wait_for :ContractDataEnd, 5 # sec
     end
 
     after(:all) { clean_connection } # Clear logs and message collector
@@ -79,24 +83,26 @@ describe "Request Contract Info", :connected => true, :integration => true do
 
     it 'receives Contract Data with extended fields' do
       contract = subject.contract
-      contract.symbol.should == 'AAPL'
+      detail = subject.contract_detail
 
+      contract.symbol.should == 'AAPL'
       contract.local_symbol.should == 'AAPL  130119C00500000'
-      contract.market_name.should == 'AAPL'
-      contract.trading_class.should == 'AAPL'
-      contract.long_name.should == 'APPLE INC'
-      contract.industry.should == 'Technology'
-      contract.category.should == 'Computers'
-      contract.subcategory.should == 'Computers'
       contract.expiry.should == '20130118'
       contract.exchange.should == 'SMART'
       contract.con_id.should be_an Integer
-      contract.trading_hours.should =~ /\d{8}:\d{4}-\d{4}/
-      contract.liquid_hours.should =~ /\d{8}:\d{4}-\d{4}/
-      contract.valid_exchanges.should =~ /CBOE/
-      contract.order_types.should be_a String
-      contract.price_magnifier.should == 1
-      contract.min_tick.should == 0.01
+
+      detail.market_name.should == 'AAPL'
+      detail.trading_class.should == 'AAPL'
+      detail.long_name.should == 'APPLE INC'
+      detail.industry.should == 'Technology'
+      detail.category.should == 'Computers'
+      detail.subcategory.should == 'Computers'
+      detail.trading_hours.should =~ /\d{8}:\d{4}-\d{4}/
+      detail.liquid_hours.should =~ /\d{8}:\d{4}-\d{4}/
+      detail.valid_exchanges.should =~ /CBOE/
+      detail.order_types.should be_a String
+      detail.price_magnifier.should == 1
+      detail.min_tick.should == 0.01
     end
   end # Request Option data
 
@@ -125,24 +131,26 @@ describe "Request Contract Info", :connected => true, :integration => true do
 
     it 'receives Contract Data with extended fields' do
       contract = subject.contract
-      contract.symbol.should == 'EUR'
+      detail = subject.contract_detail
 
+      contract.symbol.should == 'EUR'
       contract.local_symbol.should == 'EUR.USD'
-      contract.market_name.should == 'EUR.USD'
-      contract.trading_class.should == 'EUR.USD'
-      contract.long_name.should == 'European Monetary Union euro'
-      contract.industry.should == ''
-      contract.category.should == ''
-      contract.subcategory.should == ''
       contract.expiry.should == ''
       contract.exchange.should == 'IDEALPRO'
       contract.con_id.should be_an Integer
-      contract.trading_hours.should =~ /\d{8}:\d{4}-\d{4}/
-      contract.liquid_hours.should =~ /\d{8}:\d{4}-\d{4}/
-      contract.valid_exchanges.should =~ /IDEALPRO/
-      contract.order_types.should be_a String
-      contract.price_magnifier.should == 1
-      contract.min_tick.should be <= 0.0001
+
+      detail.market_name.should == 'EUR.USD'
+      detail.trading_class.should == 'EUR.USD'
+      detail.long_name.should == 'European Monetary Union euro'
+      detail.industry.should == ''
+      detail.category.should == ''
+      detail.subcategory.should == ''
+      detail.trading_hours.should =~ /\d{8}:\d{4}-\d{4}/
+      detail.liquid_hours.should =~ /\d{8}:\d{4}-\d{4}/
+      detail.valid_exchanges.should =~ /IDEALPRO/
+      detail.order_types.should be_a String
+      detail.price_magnifier.should == 1
+      detail.min_tick.should be <= 0.0001
     end
   end # Request Forex data
 
@@ -168,24 +176,26 @@ describe "Request Contract Info", :connected => true, :integration => true do
 
     it 'receives Contract Data with extended fields' do
       contract = subject.contract
-      contract.symbol.should == 'YM'
+      detail = subject.contract_detail
 
+      contract.symbol.should == 'YM'
       contract.local_symbol.should =~ /YM/
-      contract.market_name.should == 'YM'
-      contract.trading_class.should == 'YM'
-      contract.long_name.should == 'Mini Sized Dow Jones Industrial Average $5'
-      contract.industry.should == ''
-      contract.category.should == ''
-      contract.subcategory.should == ''
       contract.expiry.should =~ Regexp.new(IB::Symbols.next_expiry)
       contract.exchange.should == 'ECBOT'
       contract.con_id.should be_an Integer
-      contract.trading_hours.should =~ /\d{8}:\d{4}-\d{4}/
-      contract.liquid_hours.should =~ /\d{8}:\d{4}-\d{4}/
-      contract.valid_exchanges.should =~ /ECBOT/
-      contract.order_types.should be_a String
-      contract.price_magnifier.should == 1
-      contract.min_tick.should == 1
+
+      detail.market_name.should == 'YM'
+      detail.trading_class.should == 'YM'
+      detail.long_name.should == 'Mini Sized Dow Jones Industrial Average $5'
+      detail.industry.should == ''
+      detail.category.should == ''
+      detail.subcategory.should == ''
+      detail.trading_hours.should =~ /\d{8}:\d{4}-\d{4}/
+      detail.liquid_hours.should =~ /\d{8}:\d{4}-\d{4}/
+      detail.valid_exchanges.should =~ /ECBOT/
+      detail.order_types.should be_a String
+      detail.price_magnifier.should == 1
+      detail.min_tick.should == 1
     end
   end # Request Forex data
 end # Contract Data

data/spec/integration/fundamental_data_spec.rb

@@ -17,7 +17,7 @@ describe 'Request Fundamental Data',
                      :contract => @contract,
                      :report_type => 'snapshot' # 'estimates', 'finstat'
 
-    @ib.wait_for :FundamentalData, 6 # sec
+    @ib.wait_for :FundamentalData, 10 # sec
   end
 
   after(:all) do
@@ -32,7 +32,7 @@ describe 'Request Fundamental Data',
   its(:request_id) { should == 456 }
   its(:data) { should be_a String }
 
-  it 'responds with XML with relevand data' do
+  it 'responds with XML with relevant data' do
     require 'xmlsimple'
     data_xml = XmlSimple.xml_in(subject.data, 'ForceArray' => false) #, 'ContentKey' => 'content')
     name = data_xml["CoIDs"]["CoID"].find {|tag| tag['Type'] == 'CompanyName'}['content']

data/spec/integration/orders/attached_spec.rb

@@ -61,10 +61,10 @@ describe 'Attached Orders', :connected => true, :integration => true do
                                           :side => :sell,
                                           :tif => tif,
                                           :order_type => attach_type,
-                                          :parent_id => @order_id_placed
+                                          :parent_id => @local_id_placed
 
-          @order_id_attached = @ib.place_order @attached_order, @contract
-          @order_id_after = @ib.next_order_id
+          @local_id_attached = @ib.place_order @attached_order, @contract
+          @local_id_after = @ib.next_local_id
           @ib.wait_for [:OpenOrder, 3], [:OrderStatus, 3], 4
         end
 

data/spec/integration/orders/combo_spec.rb

@@ -25,9 +25,9 @@ describe "Combo Order", :connected => true, :integration => true, :slow => true
 
     after(:all) { close_connection }
 
-    it 'changes client`s next_order_id' do
-      @order_id_placed.should == @order_id_before
-      @ib.next_order_id.should == @order_id_before + 1
+    it 'changes client`s next_local_id' do
+      @local_id_placed.should == @local_id_before
+      @ib.next_local_id.should == @local_id_before + 1
     end
 
     it { @ib.received[:OpenOrder].should have_at_least(1).open_order_message }

data/spec/integration/orders/placement_spec.rb

@@ -23,9 +23,9 @@ describe 'Orders', :connected => true, :integration => true do
       @ib.received[:OrderStatus].should be_empty
     end
 
-    it 'still changes client`s next_order_id' do
-      @order_id_placed.should == @order_id_before
-      @ib.next_order_id.should == @order_id_before + 1
+    it 'still changes client`s next_local_id' do
+      @local_id_placed.should == @local_id_before
+      @ib.next_local_id.should == @local_id_before + 1
     end
 
     context 'received :Alert message' do
@@ -52,9 +52,9 @@ describe 'Orders', :connected => true, :integration => true do
 
     after(:all) { close_connection }
 
-    it 'changes client`s next_order_id' do
-      @order_id_placed.should == @order_id_before
-      @ib.next_order_id.should == @order_id_before + 1
+    it 'changes client`s next_local_id' do
+      @local_id_placed.should == @local_id_before
+      @ib.next_local_id.should == @local_id_before + 1
     end
 
     it { @ib.received[:OpenOrder].should have_at_least(1).open_order_message }
@@ -103,8 +103,8 @@ describe 'Orders', :connected => true, :integration => true do
 
       it { @ib.received[:Alert].should have_exactly(1).alert_message }
 
-      it 'does not increase client`s next_order_id further' do
-        @ib.next_order_id.should == @order_id_after
+      it 'does not increase client`s next_local_id further' do
+        @ib.next_local_id.should == @local_id_after
       end
 
       it 'does not receive Order messages' do

data/spec/integration/orders/{execution_spec.rb → trades_spec.rb}

@@ -21,10 +21,6 @@ describe "Trades", :connected => true, :integration => true, :slow => true do
                     :total_quantity => 20000,
                     :limit_price => 2,
                     :action => 'BUY'
-                    #:all_or_none => 1,
-                    #:fa_profile => 2,
-                    #:percent_offset => 3,
-                    #:clearing_account => 'z',
                     #:what_if => true
 
         @ib.wait_for(5, :ExecutionData, :OpenOrder) do
@@ -35,12 +31,12 @@ describe "Trades", :connected => true, :integration => true, :slow => true do
 
       after(:all) do
         clean_connection # Clear logs and message collector
-        @ib.cancel_order @order_id_placed # Just in case...
+        @ib.cancel_order @local_id_placed # Just in case...
       end
 
-      it 'changes client`s next_order_id' do
-        @order_id_placed = @order_id_before
-        @ib.next_order_id.should == @order_id_before + 1
+      it 'changes client`s next_local_id' do
+        @local_id_placed = @local_id_before
+        @ib.next_local_id.should == @local_id_before + 1
       end
 
       it { @ib.received[:OpenOrder].should have_at_least(1).open_order_message }
@@ -78,12 +74,12 @@ describe "Trades", :connected => true, :integration => true, :slow => true do
 
       after(:all) do
         clean_connection # Clear logs and message collector
-        @ib.cancel_order @order_id_placed # Just in case...
+        @ib.cancel_order @local_id_placed # Just in case...
       end
 
-      it 'changes client`s next_order_id' do
-        @order_id_placed = @order_id_before
-        @ib.next_order_id.should == @order_id_before + 1
+      it 'changes client`s next_local_id' do
+        @local_id_placed = @local_id_before
+        @ib.next_local_id.should == @local_id_before + 1
       end
 
       it { @ib.received[:OpenOrder].should have_at_least(1).open_order_message }

data/spec/integration/orders/valid_ids_spec.rb

@@ -9,8 +9,8 @@ shared_examples_for 'Received single id' do
 
   it 'receives next valid for Order placement' do
     subject.should be_an IB::Messages::Incoming::NextValidId
-    subject.order_id.should be_an Integer
-    @id[:at_connect] ||= subject.order_id # just assign once
+    subject.local_id.should be_an Integer
+    @id[:at_connect] ||= subject.local_id # just assign once
   end
 
   it 'logs next valid order id' do
@@ -24,7 +24,7 @@ shared_examples_for 'Received single id after request' do
   it_behaves_like 'Received single id'
 
   it 'no new id is generated by this request' do
-    subject.order_id.should == @id[:at_connect]
+    subject.local_id.should == @id[:at_connect]
   end
 
   it 'does not receive :OpenOrderEnd message' do

data/spec/message_helper.rb

@@ -46,7 +46,7 @@ def clean_connection
 end
 
 def close_connection
-  @ib.cancel_order @order_id_placed if @ib && @order_id_placed
+  @ib.cancel_order @local_id_placed if @ib && @local_id_placed
   @ib.close if @ib
   clean_connection
 end