test/style_test.rb in osheet-0.10.0 vs test/style_test.rb in osheet-1.0.0.rc.1

@@ -1,38 +1,32 @@
 require "assert"
+
 require "osheet/style"
 
 module Osheet
 
   class StyleTest < Assert::Context
-    desc "Osheet::Style"
+    desc "a Style"
     before { @st = Style.new('.test') }
     subject { @st }
 
-    should have_reader :selectors
-    should have_instance_methods :align, :font, :bg
-    should have_instance_methods :border, :border_left, :border_top, :border_right, :border_bottom
+    should have_reader :selectors, :build
+    should have_instance_methods :align, :font, :bg, :border
+    should have_instance_methods :border_left, :border_top
+    should have_instance_methods :border_right, :border_bottom
     should have_instance_method :match?
 
     should "set it's defaults" do
       assert_equal 1, subject.selectors.size
       assert_equal '.test', subject.selectors.first
       [ :align, :font, :bg,
         :border_left, :border_top, :border_right, :border_bottom
       ].each do |a|
-        assert_equal [], subject.send(:get_ivar, a)
+        assert_equal [], subject.send(a)
       end
     end
 
-    should "know it's attribute(s)" do
-      [ :align, :font, :bg,
-        :border_left, :border_top, :border_right, :border_bottom
-      ].each do |a|
-        assert subject.attributes.has_key?(a)
-      end
-    end
-
     should "complain about bad selectors" do
       ['poo', '#poo', 'poo poo', 'poo > poo', :poo, 123].each do |s|
         assert_raises ArgumentError do
           Style.new(s)
         end
@@ -51,19 +45,19 @@
       :border_left, :border_top, :border_right, :border_bottom
     ].each do |a|
       should "collect styles for #{a}" do
         args = [1, "#FF0000", "Verdana", :love, 1.2]
         subject.send(a, *args)
-        assert_equal args, subject.send(:get_ivar, a)
+        assert_equal args, subject.send(a)
       end
     end
 
     should "set all border positions to the same styles using 'border' macro collector" do
       args = [:thick, '#FF00FF', :dot]
       subject.border *args
       [ :border_left, :border_top, :border_right, :border_bottom].each do |a|
-        assert_equal args, subject.send(:get_ivar, a)
+        assert_equal args, subject.send(a)
       end
     end
 
     should "match on style class strings" do
       a = Style.new('.awesome') {}
@@ -84,20 +78,9 @@
         styles.each do |style|
           assert_equal true, style.match?(style_class)
         end
       end
       assert_equal false, a.match?('stupid')
-    end
-
-    should "access instance vars from that block's binding" do
-      @test = 20
-      @style = Style.new('.test') { font @test }
-
-      assert !@style.send(:instance_variable_get, "@test").nil?
-      assert_equal @test, @style.send(:instance_variable_get, "@test")
-      assert_equal @test.object_id, @style.send(:instance_variable_get, "@test").object_id
-      assert_equal @test, @style.attributes[:font].first
-      assert_equal @test.object_id, @style.attributes[:font].first.object_id
     end
 
   end
 
 end