fixed event specs

lib/controll/event/helper.rb

@@ -4,12 +4,12 @@ def normalize event, *args
       case event
       when Controll::Event
         event
-      when Symbol
-        create_event event, *args
+      when Symbol, String
+        create_event event.to_sym, *args
       when Hash, Hashie::Mash
         create_event event.delete(:name), event
       else
-        raise Controll::Event::InvalidError, "Event: #{event} could not be normalized, must be a Hash or Symbol"
+        raise Controll::Event::InvalidError, "Event: #{event} could not be normalized, must be a Hash, String or Symbol"
       end
     end
 

spec/controll/enabler_spec.rb

@@ -15,15 +15,15 @@ def render path
   let(:controller) { MyController }
 
   context 'instance' do
-    describe 'do_redirect *args' do
+    describe 'do_redirect' do
       specify do
-        subject.do_redirect.should == nil
+        expect { subject.do_redirect }.to raise_error(ArgumentError)
       end
     end
 
-    describe 'do_render *args' do
+    describe 'do_render' do
       specify do
-        subject.do_render.should == nil
+        expect { subject.do_render }.to raise_error(ArgumentError)
       end
     end
   end

spec/controll/event/helper_spec.rb

@@ -13,13 +13,21 @@ class Container
   let(:event)       { 'sign_in' }
   let(:bad_event)   { 'unknown' }
 
-  describe '.initialize event' do
-    its(:event) { should == 'sign_in' }
-  end
+  describe '.normalize event' do
+    context 'Controll::Event' do
+      specify { subject.normalize(Controll::Event.new(:x)).should be_a Controll::Event  }
+    end
+
+    context 'Symbol' do
+      specify { subject.normalize(:x).should be_a Controll::Event  }
+    end
 
-  describe '.match? events' do
-    specify { subject.match?(events).should be_true }
+    context 'Hash' do
+      specify { subject.normalize(:name => :y).should be_a Controll::Event  }
+    end    
+  end
 
-    specify { subject.match?(bad_events).should be_false }
+  describe '.create_event' do
+    specify { subject.create_event(:x).should be_a Controll::Event }
   end
 end

spec/controll/event/matcher_spec.rb

@@ -10,7 +10,8 @@
   let(:bad_event)   { 'unknown' }
 
   describe '.initialize event' do
-    its(:event) { should == 'sign_in' }
+    its(:event) { should be_a Controll::Event }
+    its('event.name') { should == :sign_in }
   end
 
   describe '.match? events' do