spec/spectifly/base/field_spec.rb in spectifly-0.0.10 vs spec/spectifly/base/field_spec.rb in spectifly-0.0.11

@@ -1,12 +1,10 @@
-require 'spec_helper'
-
 describe Spectifly::Base::Field do
   describe '#name' do
     it 'returns tokenized version of field name' do
       field = described_class.new('A really cool hat')
-      field.name.should == 'a_really_cool_hat'
+      expect(field.name).to eq('a_really_cool_hat')
     end
   end
 
   describe '.initialize' do
     it 'throws an exception if Boolean shortcut conflicts with type' do
@@ -17,84 +15,84 @@
   end
 
   describe '#type' do
     it 'defaults to string if no type specified' do
       field = described_class.new('A really cool hat')
-      field.type.should == 'string'
+      expect(field.type).to eq('string')
     end
 
     it 'returns boolean if field name has "?" token' do
       field = described_class.new('A really cool hat?')
-      field.type.should == 'boolean'
+      expect(field.type).to eq('boolean')
     end
 
     it 'returns type if specified' do
       field = described_class.new('some field', 'Type' => 'Rhubarb')
-      field.type.should == 'rhubarb'
+      expect(field.type).to eq('rhubarb')
     end
   end
 
   describe '#extract_restrictions' do
     it 'sets up minimum and maximum value restrictions' do
       field = described_class.new('some field', {
         'Minimum Value' => 3, 'Maximum Value' => 145
       })
-      field.restrictions.should == {
+      expect(field.restrictions).to eq({
         'minimum_value' => 3,
         'maximum_value' => 145
-      }
+      })
     end
 
     it 'sets up enumerations' do
       field = described_class.new('some field', {
         'Valid Values' => [34, 52, 100, 4]
       })
-      field.restrictions.should == {
+      expect(field.restrictions).to eq({
         'valid_values' => [34, 52, 100, 4]
-      }
+      })
     end
 
     it 'pulls regex restriction from validations' do
       field = described_class.new('some field', {
         'Validations' => 'Must match regex "^[0-9]{4}"'
       })
-      field.validations.should be_empty
-      field.restrictions.should == {
+      expect(field.validations).to be_empty
+      expect(field.restrictions).to eq({
         'regex' => /^[0-9]{4}/
-      }
+      })
     end
 
     it 'sets restrictions to empty hash if none exist' do
       field = described_class.new('some field')
-      field.restrictions.should be_empty
+      expect(field.restrictions).to be_empty
     end
   end
 
   describe '#multiple?' do
     it 'returns true if multiple set to true' do
       field = described_class.new('some field', 'Multiple' => true)
-      field.should be_multiple
+      expect(field).to be_multiple
     end
 
     it 'returns false if multiple set to anything but true' do
       field = described_class.new('some field', 'Multiple' => 'Whatever')
-      field.should_not be_multiple
+      expect(field).not_to be_multiple
     end
 
     it 'returns false if multiple not set' do
       field = described_class.new('some field')
-      field.should_not be_multiple
+      expect(field).not_to be_multiple
     end
   end
 
   describe '#required?' do
     it 'returns true if field name has "*" token' do
       field = described_class.new('some field*')
-      field.should be_required
+      expect(field).to be_required
     end
 
     it 'returns false if field name does not have "*" token' do
       field = described_class.new('some field')
-      field.should_not be_required
+      expect(field).not_to be_required
     end
   end
-end
\ No newline at end of file
+end