amee-data-abstraction 1.3.1 → 2.0.0

data/spec/amee-data-abstraction/calculation_spec.rb

@@ -1,58 +1,53 @@
-require 'spec_helper'
-
+require File.dirname(File.dirname(__FILE__)) + '/spec_helper.rb'
 describe Calculation do
   
-  before :all do
-    @calc = CalculationSet.find("transport")[:transport]
-  end
-  
   it 'can create an instance' do
-    @calc.should be_a Calculation
+    Transport.should be_a Calculation
   end
   it 'should have ordered terms, with labels' do
-    @calc.terms.labels.should eql [:fuel,:size,:distance,:co2]
+    Transport.terms.labels.should eql [:fuel,:size,:distance,:co2]
   end
   it 'should have amee paths for the terms' do
-    @calc.terms.paths.should eql ['fuel','size','distance','default']
+    Transport.terms.paths.should eql ['fuel','size','distance',:default]
   end
   it 'should have human names for the terms' do
-    @calc.terms.names.
+    Transport.terms.names.
       should eql ['Fuel Type','Vehicle Size','Distance Driven','Carbon Dioxide']
   end
   it 'should return the inputs' do
-    @calc.inputs.labels.should  eql [:fuel,:size,:distance]
+    Transport.inputs.labels.should  eql [:fuel,:size,:distance]
   end
   it 'should return the outputs' do
-    @calc.outputs.labels.should  eql [:co2]
+    Transport.outputs.labels.should  eql [:co2]
   end
   it 'should generate an discover URL' do
-    @calc.discover_url.should eql 'http://discover.amee.com/categories/transport/car/generic'
+    Transport.discover_url.should eql 'http://discover.amee.com/categories/transport/car/generic'
   end
   it 'should redirect to discover URL' do
-    @calc.explorer_url.should eql 'http://discover.amee.com/categories/transport/car/generic'
+    Transport.explorer_url.should eql 'http://discover.amee.com/categories/transport/car/generic'
   end
   it 'can return a term via []' do
-    @calc[:co2].label.should eql :co2
+    Transport[:co2].label.should eql :co2
   end
   it 'when copied, should deep copy the values' do
-    x=@calc.clone
+    x=Transport.clone
     x[:co2].value :somevalue
     x[:co2].value.should eql :somevalue
-    @calc[:co2].value.should be_nil
+    Transport[:co2].value.should be_nil
   end
   it 'knows to get terms that come before or after others' do
-    t=@calc.clone
+    t=Transport.clone
     t.before(:distance).labels.
       should eql [:fuel,:size]
     t.after(:distance).map(&:label).
       should eql [:co2]
   end
   it 'delegates selectors to terms list' do
-    t=@calc.clone
+    t=Transport.clone
     t.drills.labels.should eql [:fuel,:size]
   end
   it 'can find its amee data category' do
-    t=@calc.clone
+    t=Transport.clone
     mocker=AMEEMocker.new self,:path=>'transport/car/generic'
     mocker.data_category
     t.send(:amee_data_category).path.should eql '/data/transport/car/generic'
@@ -60,18 +55,18 @@ describe Calculation do
   it 'can find its amee item definition' do
     mocker=AMEEMocker.new self,:path=>'transport/car/generic'
     mocker.item_definition(:my_itemdef_name).data_category
-    t=@calc.clone
+    t=Transport.clone
     t.send(:amee_item_definition).name.should eql :my_itemdef_name
   end
   it 'can give item value definition list' do
     mocker=AMEEMocker.new self,:path=>'transport/car/generic'
     mocker.item_value_definition('distance').item_value_definitions.
       item_definition.data_category
-    t=@calc.clone
+    t=Transport.clone
     t.send(:amee_ivds).first.path.should eql 'distance'
   end
   it 'can memoise access to  AMEE' do
-    t=@calc.clone
+    t=Transport.clone
     #AMEE::Data::Category.get(connection, "/data#{path}")
     flexmock(AMEE::Data::Category).should_receive(:get).
       with(AMEE::DataAbstraction.connection,'/data/transport/car/generic').

data/spec/amee-data-abstraction/drill_spec.rb

@@ -1,30 +1,21 @@
-require 'spec_helper'
-
+require File.dirname(File.dirname(__FILE__)) + '/spec_helper.rb'
 describe Drill do
-  
-  
-  before :all do
-    @calc = CalculationSet.find("transport")[:transport]
-  end
-  
   it 'knows its options when it is the first choice' do
     AMEEMocker.new(self,:path=>'transport/car/generic',
       :selections=>[],
       :choices=>['diesel','petrol']).drill
-    @calc.begin_calculation[:fuel].send(:choices).should eql ['diesel','petrol']
+    Transport.begin_calculation[:fuel].send(:choices).should eql ['diesel','petrol']
   end
-
   it 'knows its options when it is a later choice' do
     AMEEMocker.new(self,:path=>'transport/car/generic',
       :selections=>[['fuel','diesel']],
       :choices=>['large','small']).drill
-    t=@calc.begin_calculation
+    t=Transport.begin_calculation
     t[:fuel].value 'diesel'
     t[:size].send(:choices).should eql ['large','small']
   end
-
-  it 'is enabled if it is the next choice or has been chosen' do
-    t=@calc.begin_calculation
+  it 'is enabled iff it is the next choice or has been chosen' do
+    t=Transport.begin_calculation
     t[:fuel].enabled?.should be_true
     t[:size].enabled?.should be_false
     t[:fuel].value 'diesel'
@@ -34,32 +25,14 @@ describe Drill do
     t[:fuel].enabled?.should be_true
     t[:size].enabled?.should be_true
   end
-
-  it 'is valid if assigned a choice in the choices' do
+  it 'is valid iff assigned a choice in the choices' do
     AMEEMocker.new(self,:path=>'transport/car/generic',
       :selections=>[],
       :choices=>['diesel','petrol']).drill
-    t=@calc.begin_calculation
+    t=Transport.begin_calculation
     t[:fuel].value 'diesel'
     t[:fuel].send(:valid?).should be_true
     t[:fuel].value 'banana'
     t[:fuel].send(:valid?).should be_false
   end
-
-  it "should set and get custom choices" do
-    t=@calc.begin_calculation
-    t[:fuel].choices 'anthracite', 'lignite'
-    t[:fuel].choices.should eql ['anthracite', 'lignite']
-  end
-
-  it 'is sets correct single choice if AMEE skips during drill' do
-    mocker = AMEEMocker.new(self,:path=>'transport/car/generic',
-      :selections=>[['fuel','diesel']])
-    mocker.drill_with_skip('size'=>'small')
-    t=@calc.begin_calculation
-    t[:fuel].value 'diesel'
-    t[:fuel].should_not be_disabled
-    t[:size].choices.should eql ['small']
-    t[:size].should be_disabled
-  end
 end

data/spec/amee-data-abstraction/input_spec.rb

@@ -1,117 +1,77 @@
-require 'spec_helper'
+require File.dirname(File.dirname(__FILE__)) + '/spec_helper.rb'
 
 describe Input do
-  
-  it 'can be given a fixed value' do
-    i=Input.new{fixed 6}
-    i.value.should eql 6
-    i.fixed?.should be_true
-    lambda{i.value 7}.should raise_error Exceptions::FixedValueInterference
-  end
+ it 'can be given a fixed value' do
+   i=Input.new{fixed 6}
+   i.value.should eql 6
+   i.fixed?.should be_true
+   lambda{i.value 7}.should raise_error Exceptions::FixedValueInterference
+ end
+ it 'raises exception when invalid' do
+   i=Input.new{validation /bark/}
+   i.value 'barking'
+   lambda{i.validate!}.should_not raise_error
+   i.value.should eql 'barking'
+   i.value 'marking'
+   lambda{i.validate!}.should raise_error Exceptions::ChoiceValidation
+   j=Input.new{}
+   j.value 'marking'
+   j.value.should eql 'marking'
+ end
+ it "can accept a numeric symbol validation" do
+   i=Input.new{validation :numeric}
+   i.value 3
+   lambda{i.validate!}.should_not raise_error
+   i.value '3'
+   lambda{i.validate!}.should_not raise_error
+   i.value 'e'
+   lambda{i.validate!}.should raise_error Exceptions::ChoiceValidation
+ end
+ it "can accept a date symbol validation" do
+   i=Input.new{validation :date}
+   i.value Date.today
+   lambda{i.validate!}.should_not raise_error
+   i.value '2011-01-01'
+   lambda{i.validate!}.should_not raise_error
+   i.value 'e'
+   lambda{i.validate!}.should raise_error Exceptions::ChoiceValidation
+ end
 
-  it "can be made optional" do
-    i=Input.new{label :mass; value 6}
-    i.should_not be_optional
-    i.should be_compulsory
-    i.optional!
-    i.should be_optional
-    i.should_not be_compulsory
-  end
-
-  it "can be made compulsory" do
-    i=Input.new{label :mass; value 6}
-    i.should_not be_optional
-    i.optional!
-    i.should be_optional
-    i.should_not be_compulsory
-    i.compulsory!
-    i.should_not be_optional
-    i.should be_compulsory
-  end
-
-  it 'raises exception when invalid' do
-    i=Input.new{validation /bark/}
-    i.value 'barking'
-    lambda{i.validate!}.should_not raise_error
-    i.value.should eql 'barking'
-    i.value 'marking'
-    lambda{i.validate!}.should raise_error Exceptions::ChoiceValidation
-    j=Input.new{}
-    j.value 'marking'
-    j.value.should eql 'marking'
-  end
-
-  it "can accept a numeric symbol validation" do
-    i=Input.new{validation :numeric}
-    i.value 3
-    lambda{i.validate!}.should_not raise_error
-    i.value '3'
-    lambda{i.validate!}.should_not raise_error
-    i.value 'e'
-    lambda{i.validate!}.should raise_error Exceptions::ChoiceValidation
-  end
-
-  it "can accept a date symbol validation" do
-    i=Input.new{validation :date}
-    i.value Date.today
-    lambda{i.validate!}.should_not raise_error
-    i.value '2011-01-01'
-    lambda{i.validate!}.should_not raise_error
-    i.value 'e'
-    lambda{i.validate!}.should raise_error Exceptions::ChoiceValidation
-  end
-
-  it "can accept a time symbol validation" do
-    i=Input.new{validation :datetime}
-    i.value DateTime.now
-    lambda{i.validate!}.should_not raise_error
-    i.value '2011-01-01 09:00:00'
-    lambda{i.validate!}.should_not raise_error
-    i.value 'e'
-    lambda{i.validate!}.should raise_error Exceptions::ChoiceValidation
-  end
-
-  it "should start with dirty set as false" do
-    i=Input.new{fixed 5}
-    i.dirty?.should eql false
-  end
-
-  it "should be dirty when the value is changed" do
-    i=Input.new
-    i.value 5
-    i.dirty?.should eql true
-  end
-
-  it 'can have custom validation message' do
-    i=Input.new{label :woof; validation /bark/; validation_message {"#{value} does not match pattern /bark/"}}
-    i.value 'marking'
-    lambda{i.validate!}.should raise_error Exceptions::ChoiceValidation,"marking does not match pattern /bark/"
-    j=Input.new{}
-    j.value 'marking'
-    j.value.should eql 'marking'
-  end
-
-  it 'can have default validation message' do
-    i=Input.new{label :woof; validation /bark/}
-    i.value 'barking'
-    lambda{i.validate!}.should_not raise_error
-    i.value.should eql 'barking'
-    i.value 'marking'
-    lambda{i.validate!}.should raise_error Exceptions::ChoiceValidation,"Woof is invalid."
-    j=Input.new{}
-    j.value 'marking'
-    j.value.should eql 'marking'
-  end
-
-  it 'is always valid if it is fixed' do
-    i=Input.new{fixed 5; validation /7/}
-    lambda{i.validate!}.should_not raise_error
-    i.value.should eql 5
-  end
-
-  it 'is always disabled if it is fixed' do
-    i=Input.new{fixed 5}
-    i.disabled?.should eql true
-  end
-  
+ it "can accept a time symbol validation" do
+   i=Input.new{validation :datetime}
+   i.value DateTime.now
+   lambda{i.validate!}.should_not raise_error
+   i.value '2011-01-01 09:00:00'
+   lambda{i.validate!}.should_not raise_error
+   i.value 'e'
+   lambda{i.validate!}.should raise_error Exceptions::ChoiceValidation
+ end
+ it 'can have custom validation message' do
+   i=Input.new{label :woof; validation /bark/; validation_message {"#{value} does not match pattern /bark/"}}
+   i.value 'marking'
+   lambda{i.validate!}.should raise_error Exceptions::ChoiceValidation,"marking does not match pattern /bark/"
+   j=Input.new{}
+   j.value 'marking'
+   j.value.should eql 'marking'
+ end
+ it 'can have default validation message' do
+   i=Input.new{label :woof; validation /bark/}
+   i.value 'barking'
+   lambda{i.validate!}.should_not raise_error
+   i.value.should eql 'barking'
+   i.value 'marking'
+   lambda{i.validate!}.should raise_error Exceptions::ChoiceValidation,"Woof is invalid."
+   j=Input.new{}
+   j.value 'marking'
+   j.value.should eql 'marking'
+ end
+ it 'is always valid if it is fixed' do
+   i=Input.new{fixed 5; validation /7/}
+   lambda{i.validate!}.should_not raise_error
+   i.value.should eql 5
+ end
+ it 'is always disabled if it is fixed' do
+   i=Input.new{fixed 5}
+   i.disabled?.should eql true
+ end
 end

data/spec/amee-data-abstraction/metadatum_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.dirname(File.dirname(__FILE__)) + '/spec_helper.rb'
 
 describe Metadatum do
  it 'defaults to be a drop-down' do

data/spec/amee-data-abstraction/ongoing_calculation_spec.rb

@@ -1,15 +1,7 @@
-require 'spec_helper'
-
+require File.dirname(File.dirname(__FILE__)) + '/spec_helper.rb'
 describe OngoingCalculation do
-
-  before :all do
-    @elec = CalculationSet.find("electricity")[:electricity]
-    @transport = CalculationSet.find("transport")[:transport]
-    @elec_and_transport = CalculationSet.find("electricity_and_transport")
-  end
-
   it 'can return set and unset inputs' do
-    d=@elec.begin_calculation
+    d=Electricity.begin_calculation
     d.inputs.set.labels.should eql [:country]
     d.inputs.unset.labels.should eql [:energy_used]
     d[:energy_used].value :somevalue
@@ -17,7 +9,7 @@ describe OngoingCalculation do
     d.inputs.unset.labels.should eql []
   end
   it 'can return set and unset terms' do
-    d=@elec.begin_calculation
+    d=Electricity.begin_calculation
     d.set.labels.should eql [:country]
     d.unset.labels.should eql [:energy_used,:co2]
     d[:energy_used].value :somevalue
@@ -25,27 +17,19 @@ describe OngoingCalculation do
     d.unset.labels.should eql [:co2]
   end
   it 'can return set and unset outputs' do
-    d=@elec.begin_calculation
+    d=Electricity.begin_calculation
     d.outputs.set.labels.should eql []
     d.outputs.unset.labels.should eql [:co2]
     d[:co2].value 5
     d.outputs.set.labels.should eql [:co2]
     d.outputs.unset.labels.should eql []
   end
-  it 'can clear outputs' do
-    d=@elec.begin_calculation
-    d.outputs.unset.labels.should eql [:co2]
-    d[:co2].value 5
-    d[:co2].value.should eql 5
-    d.clear_outputs
-    d[:co2].value.should be_nil
-  end
   it 'can have values chosen' do
     AMEEMocker.new(self,:path=>'business/energy/electricity/grid',
       :selections=>[['country','argentina']],
       :choices=>[]).drill
 
-    d=@elec.begin_calculation
+    d=Electricity.begin_calculation
 
     d.inputs.set.values.should eql ['argentina']
     d.inputs.unset.values.should eql [nil]
@@ -59,7 +43,7 @@ describe OngoingCalculation do
     AMEEMocker.new(self,:path=>'business/energy/electricity/grid',
       :selections=>[['country','argentina']],
       :choices=>[]).drill
-    d=@elec.begin_calculation
+    d=Electricity.begin_calculation
     d.satisfied?.should be_false
     d.choose!(:energy_used=>5.0)
     d.satisfied?.should be_true
@@ -74,7 +58,7 @@ describe OngoingCalculation do
     mocker.select('size'=>'large')
     mocker.choices=[]
     mocker.drill
-    t=@transport.begin_calculation
+    t=Transport.begin_calculation
     t.terms.labels.should eql [:fuel,:size,:distance,:co2]
     t.satisfied?.should be_false
 
@@ -83,13 +67,13 @@ describe OngoingCalculation do
     t.inputs.unset.labels.should eql [:size,:distance]
     t.satisfied?.should be_false
 
-    t2=@transport.begin_calculation
+    t2=Transport.begin_calculation
     t2.choose!('fuel'=>'diesel','size'=>'large')
     t2.inputs.set.labels.should eql [:fuel,:size]
     t2.inputs.unset.labels.should eql [:distance]
     t2.satisfied?.should be_false
 
-    t3=@transport.begin_calculation
+    t3=Transport.begin_calculation
     t3.choose!('fuel'=>'diesel','size'=>'large','distance'=>5)
     t3.inputs.set.labels.should eql [:fuel,:size,:distance]
     t3.inputs.unset.labels.should eql []
@@ -108,7 +92,7 @@ describe OngoingCalculation do
     mocker.choices=[]
     mocker.drill
     mocker.profile_list.profile_category.timestamp.create_and_get
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     mycalc.choose!('fuel'=>'diesel','size'=>'large','distance'=>5)
     mycalc.calculate!
     mycalc.outputs.first.value.should eql :somenumber
@@ -126,7 +110,7 @@ describe OngoingCalculation do
     mocker.choices=[]
     mocker.drill
     mocker.profile_list.profile_category.timestamp.create_and_get
-    mycalc=@elec_and_transport[:transport].begin_calculation
+    mycalc=ElectricityAndTransport[:transport].begin_calculation
     mycalc.choose!('fuel'=>'diesel','size'=>'large','distance'=>5,'department'=>'stuff')
     mycalc.calculate!
     mycalc.outputs.first.value.should eql :somenumber
@@ -150,7 +134,7 @@ describe OngoingCalculation do
   #end
 
   it 'can be supplied just a UID, and recover PIVs and drill values from AMEE' do
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     mocker=AMEEMocker.new(self,:path=>'transport/car/generic',
       :result=>:somenumber,
       :existing=>{'distance'=>5},:choices=>['petrol','diesel'])
@@ -167,7 +151,7 @@ describe OngoingCalculation do
   end
 
   it 'refuses to load values from AMEE which conflict with local drill values' do
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     mocker=AMEEMocker.new(self,:path=>'transport/car/generic',
       :result=>:somenumber,
       :existing=>{'distance'=>7},
@@ -203,7 +187,7 @@ describe OngoingCalculation do
     mocker.choices=[]
     mocker.drill
     mocker.profile_list.update.get(true)
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     mycalc.choose!(:profile_item_uid=>mocker.uid,'fuel'=>'diesel','size'=>'large','distance'=>9)
     mycalc.calculate!
     mycalc[:distance].value.should eql 9
@@ -227,7 +211,7 @@ describe OngoingCalculation do
     mocker.params={'distance'=>9}
     mocker.update.get(true)
 
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     mycalc.choose!('fuel'=>'diesel','size'=>'large','distance'=>5)
     mycalc.calculate!
     mycalc.choose!('fuel'=>'diesel','size'=>'large','distance'=>9)
@@ -252,7 +236,7 @@ describe OngoingCalculation do
     mocker.select('size'=>'small')
     mocker.drill.create_and_get
     
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     mycalc.choose!('fuel'=>'diesel','size'=>'large','distance'=>5)
     mycalc.calculate!
     mycalc.choose!('fuel'=>'diesel','size'=>'small')
@@ -261,7 +245,7 @@ describe OngoingCalculation do
   end
 
   it 'memoizes profile information, but not across a pass' do
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     mocker=AMEEMocker.new(self,:path=>'transport/car/generic',
       :result=>:somenumber,
       :existing=>{'distance'=>5},:choices=>['petrol','diesel'])
@@ -293,7 +277,7 @@ describe OngoingCalculation do
     mocker.choices=[]
     mocker.drill
     mocker.profile_list.profile_category.timestamp.create_and_get
-    myproto=@transport.clone
+    myproto=Transport.clone
     myproto.instance_eval{
       start_and_end_dates
     }
@@ -316,7 +300,7 @@ describe OngoingCalculation do
     mocker.select('size'=>'large')
     mocker.choices=[]
     mocker.drill
-    myproto=@transport.clone
+    myproto=Transport.clone
     myproto.instance_eval{
       start_and_end_dates
     }
@@ -326,7 +310,7 @@ describe OngoingCalculation do
   end
 
   it 'starts off dirty' do  
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     mycalc.should be_dirty
   end
 
@@ -343,7 +327,7 @@ describe OngoingCalculation do
     mocker.choices=[]
     mocker.drill
     mocker.profile_list.profile_category.timestamp.create_and_get
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     mycalc.should be_dirty
     mycalc.choose!('fuel'=>'diesel','size'=>'large','distance'=>5)
     mycalc.calculate!
@@ -365,7 +349,7 @@ describe OngoingCalculation do
     mocker.choices=[]
     mocker.drill
     mocker.profile_list.profile_category.timestamp.create_and_get
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     mycalc.should be_dirty
     mycalc.choose!('fuel'=>'diesel','size'=>'large','distance'=>5)
     mycalc.calculate!
@@ -388,7 +372,7 @@ describe OngoingCalculation do
     mocker.select('size'=>'marge')
     mocker.choices=[]
     mocker.drill
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     lambda{mycalc.choose!('fuel'=>'diesel','size'=>'marge','distance'=>5)}.should raise_error Exceptions::ChoiceValidation
     mycalc.invalidity_messages.keys.should eql [:size]
   end
@@ -405,7 +389,7 @@ describe OngoingCalculation do
     mocker.select('size'=>'marge')
     mocker.choices=[]
     mocker.drill
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     mycalc.choose('fuel'=>'diesel','size'=>'marge','distance'=>5).should be_false
     mycalc.invalidity_messages.keys.should eql [:size]
   end
@@ -422,12 +406,12 @@ describe OngoingCalculation do
     mocker.select('size'=>'large')
     mocker.choices=[]
     mocker.drill
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     mycalc.choose('fuel'=>'diesel','size'=>'large','distance'=>5).should be_true
   end
 
   it 'can blank individual term attributes with empty string' do
-    myproto=@transport.clone
+    myproto=Transport.clone
     mycalc=myproto.begin_calculation
     mycalc.choose_without_validation!('fuel'=>'diesel','size'=>'large','distance'=>{:value =>5, :unit=> Unit.km})
     mycalc['fuel'].value.should eql 'diesel'
@@ -442,7 +426,7 @@ describe OngoingCalculation do
   end
 
   it 'can blank individual term attributes with nil' do
-    myproto=@transport.clone
+    myproto=Transport.clone
     mycalc=myproto.begin_calculation
     mycalc.choose_without_validation!('fuel'=>'diesel','size'=>'large','distance'=>{:value =>5, :unit=> Unit.km})
     mycalc['fuel'].value.should eql 'diesel'
@@ -457,7 +441,7 @@ describe OngoingCalculation do
   end
 
     it 'can update individual term attributes without nullifying others' do
-    myproto=@transport.clone
+    myproto=Transport.clone
     mycalc=myproto.begin_calculation
     mycalc.choose_without_validation!('fuel'=>'diesel','size'=>'large','distance'=>{:value =>5, :unit=> Unit.km})
     mycalc['fuel'].value.should eql 'diesel'
@@ -498,7 +482,7 @@ describe OngoingCalculation do
     mocker.select('size'=>'marge')
     mocker.choices=[]
     mocker.drill
-    mycalc=@transport.begin_calculation
+    mycalc=Transport.begin_calculation
     mycalc.choose('fuel'=>'diesel','size'=>'marge','distance'=>5).should be_false
     mycalc.invalidity_messages.keys.should eql [:size]
     mycalc[:size].value.should eql 'marge'