input_helpers_spec.rb in squib-0.3.0

- old
+ new

@@ -97,30 +97,25 @@
     end
 
   end
 
   context '#colorify' do
-    it 'should parse if nillable' do
+    it 'should pass through if nillable' do
       color = @deck.send(:colorify, {color: ['#fff']}, true)[:color]
-      expect(color.to_a[0].to_a).to eq([1.0, 1.0, 1.0, 1.0])
+      expect(color).to eq(['#fff'])
     end
 
-    it 'raises and error if the color does not exist' do
-      expect{ @deck.send(:colorify, {color: [:nonexist]}, false) }.to \
-        raise_error(ArgumentError, 'unknown color name: nonexist')
-    end
-
     it 'pulls from custom colors in the config' do
       @deck.custom_colors['foo'] = '#abc'
       expect(@deck.send(:colorify, {color: [:foo]}, false)[:color][0].to_s).to \
-        eq('#AABBCCFF')
+        eq('#abc')
     end
 
     it 'pulls custom colors even when a string' do
       @deck.custom_colors['foo'] = '#abc'
       expect(@deck.send(:colorify, {color: ['foo']}, false)[:color][0].to_s).to \
-        eq('#AABBCCFF')
+        eq('#abc')
     end
   end
 
   context '#rotateify' do
     it 'computes a clockwise rotate properly' do
@@ -177,9 +172,16 @@
      it 'converts centimeters' do
       args = {x: ['2cm']}
       needed_params = [:x]
       opts = @deck.send(:convert_units, args, needed_params)
       expect(opts).to eq({:x => [236.2204722] }) #assume 300dpi default
+    end
+
+    it 'handles non-expading singletons' do
+      args = {margin: '1in', trim: '1in', gap: '1in'}
+      needed_params = [:margin, :trim, :gap]
+      opts = @deck.send(:convert_units, args, needed_params)
+      expect(opts).to eq({margin: 300, trim: 300, gap: 300}) #assume 300dpi default
     end
 
   end
 
   context '#rowify' do