spec/choice_spec.rb in bindata-0.6.0 vs spec/choice_spec.rb in bindata-0.7.0

@@ -4,28 +4,28 @@
 require 'bindata/choice'
 require 'bindata/int'
 require 'bindata/lazy'
 require 'bindata/struct'
 
-context "Instantiating a Choice" do
-  specify "should ensure mandatory parameters are supplied" do
+describe "Instantiating a Choice" do
+  it "should ensure mandatory parameters are supplied" do
     args = {}
     lambda { BinData::Choice.new(args) }.should raise_error(ArgumentError)
     args = {:selection => 1}
     lambda { BinData::Choice.new(args) }.should raise_error(ArgumentError)
     args = {:choices => []}
     lambda { BinData::Choice.new(args) }.should raise_error(ArgumentError)
   end
 
-  specify "should fail if a given type is unknown" do
+  it "should fail if a given type is unknown" do
     args = {:choices => [:does_not_exist], :selection => 0}
     lambda { BinData::Choice.new(args) }.should raise_error(TypeError)
   end
 end
 
-context "A Choice with several choices" do
-  setup do
+describe "A Choice with several choices" do
+  before(:each) do
     # allow specifications to select the choice
     @env = BinData::LazyEvalEnv.new
     @env.class.class_eval { attr_accessor :choose }
 
     @data = BinData::Choice.new({:choices => [[:int8, {:initial_value => 3}],
@@ -36,11 +36,11 @@
                                               [:int8, {:initial_value => 7}]],
                                  :selection => :choose},
                                 @env)
   end
 
-  specify "should be able to select the choice" do
+  it "should be able to select the choice" do
     @env.choose = 0
     @data.value.should eql(3)
     @env.choose = 1
     @data.value.should eql(5)
     @env.choose = 2
@@ -49,32 +49,32 @@
     @data.a.should eql(0)
     @env.choose = 4
     @data.value.should eql(7)
   end
 
-  specify "should not be able to select an invalid choice" do
+  it "should not be able to select an invalid choice" do
     @env.choose = -1
     lambda { @data.value }.should raise_error(IndexError)
     @env.choose = 5
     lambda { @data.value }.should raise_error(IndexError)
   end
 
-  specify "should be able to interact directly with the choice" do
+  it "should be able to interact directly with the choice" do
     @env.choose = 0
     @data.value = 17
     @data.value.should eql(17)
   end
 
-  specify "should handle missing methods correctly" do
+  it "should handle missing methods correctly" do
     @env.choose = 0
 
     @data.should respond_to(:value)
     @data.should_not respond_to(:does_not_exist)
     lambda { @data.does_not_exist }.should raise_error(NoMethodError)
   end
 
-  specify "should delegate methods to the selected single choice" do
+  it "should delegate methods to the selected single choice" do
     @env.choose = 1
     @data.value = 17
 
     @data.find_obj_for_name("does_not_exist").should be_nil
     @data.num_bytes.should eql(2)
@@ -93,10 +93,10 @@
     @data.value.should eql(17)
 
     @data.snapshot.should eql(17)
   end
 
-  specify "should delegate methods to the selected complex choice" do
+  it "should delegate methods to the selected complex choice" do
     @env.choose = 3
     @data.find_obj_for_name("a").should_not be_nil
     @data.field_names.should eql(["a"])
     @data.num_bytes.should eql(1)
   end