merge complete

spec/lib/em-webfinger_spec.rb

@@ -47,8 +47,6 @@ describe EMWebfinger do
           EMWebfinger.new('eviljoe@diaspora.local:3000')
         }.should raise_error(RuntimeError, "Identifier is invalid")
       end  
-      proc{EMWebfinger.new("asfadfasdf")}.should raise_error
-    end
     end
 
 
@@ -59,6 +57,7 @@ describe EMWebfinger do
 
         n.on_person{|person| puts "foo"}
         n.instance_variable_get(:@callbacks).count.should be 1
+      end
 
       it 'should not blow up if the returned xrd is nil' do
         http = FakeHttpRequest.new(:success)
@@ -72,7 +71,6 @@ describe EMWebfinger do
         }
       end
     end
-  end
 
     describe '#fetch' do
       it 'should require a callback' do
@@ -136,5 +134,5 @@ describe EMWebfinger do
         }
       end
     end
+  end
 end
-