blather 0.6.2 → 0.7.0

data/spec/blather/client/dsl/pubsub_spec.rb

@@ -12,15 +12,15 @@ describe Blather::DSL::PubSub do
 
   it 'raises an error when trying to send a stanza without a host' do
     @pubsub.host = nil
-    proc { @pubsub.affiliations }.must_raise RuntimeError
+    proc { @pubsub.affiliations }.should raise_error RuntimeError
   end
 
   it 'requests affiliations' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Affiliations
-      n.find('//ns:pubsub/ns:affiliations', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :get
+      n.should be_instance_of Blather::Stanza::PubSub::Affiliations
+      n.find('//ns:pubsub/ns:affiliations', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :get
     end
     @pubsub.affiliations
   end
@@ -28,20 +28,20 @@ describe Blather::DSL::PubSub do
   it 'requests affiliations from a specified host' do
     host = 'another.host'
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Affiliations
-      n.find('//ns:pubsub/ns:affiliations', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(host)
-      n.type.must_equal :get
+      n.should be_instance_of Blather::Stanza::PubSub::Affiliations
+      n.find('//ns:pubsub/ns:affiliations', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(host)
+      n.type.should == :get
     end
     @pubsub.affiliations host
   end
 
   it 'requests subscriptions' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Subscriptions
-      n.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :get
+      n.should be_instance_of Blather::Stanza::PubSub::Subscriptions
+      n.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :get
     end
     @pubsub.subscriptions
   end
@@ -49,20 +49,20 @@ describe Blather::DSL::PubSub do
   it 'requests subscriptions from a specified host' do
     host = 'another.host'
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Subscriptions
-      n.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(host)
-      n.type.must_equal :get
+      n.should be_instance_of Blather::Stanza::PubSub::Subscriptions
+      n.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(host)
+      n.type.should == :get
     end
     @pubsub.subscriptions host
   end
 
   it 'requests nodes defaulting to "/"' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::DiscoItems
-      n.find("/iq/ns:query[@node='/']", :ns => Blather::Stanza::DiscoItems.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :get
+      n.should be_instance_of Blather::Stanza::DiscoItems
+      n.find("/iq/ns:query[@node='/']", :ns => Blather::Stanza::DiscoItems.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :get
     end
     @pubsub.nodes nil
   end
@@ -70,210 +70,210 @@ describe Blather::DSL::PubSub do
   it 'requests nodes from a specified host' do
     host = 'another.host'
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::DiscoItems
-      n.find("/iq/ns:query[@node='/']", :ns => Blather::Stanza::DiscoItems.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(host)
-      n.type.must_equal :get
+      n.should be_instance_of Blather::Stanza::DiscoItems
+      n.find("/iq/ns:query[@node='/']", :ns => Blather::Stanza::DiscoItems.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(host)
+      n.type.should == :get
     end
     @pubsub.nodes nil, host
   end
 
   it 'requests nodes under a specified path' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::DiscoItems
-      n.find("/iq/ns:query[@node='/path/to/nodes']", :ns => Blather::Stanza::DiscoItems.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :get
+      n.should be_instance_of Blather::Stanza::DiscoItems
+      n.find("/iq/ns:query[@node='/path/to/nodes']", :ns => Blather::Stanza::DiscoItems.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :get
     end
     @pubsub.nodes '/path/to/nodes'
   end
 
   it 'requests information on a node' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::DiscoInfo
-      n.find("/iq/ns:query[@node='/path/to/node']", :ns => Blather::Stanza::DiscoInfo.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :get
+      n.should be_instance_of Blather::Stanza::DiscoInfo
+      n.find("/iq/ns:query[@node='/path/to/node']", :ns => Blather::Stanza::DiscoInfo.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :get
     end
     @pubsub.node '/path/to/node'
   end
 
   it 'requests all items from a node' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Items
-      n.find("/iq/ns:pubsub/ns:items[@node='/path/to/node']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :get
+      n.should be_instance_of Blather::Stanza::PubSub::Items
+      n.find("/iq/ns:pubsub/ns:items[@node='/path/to/node']", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :get
     end
     @pubsub.items '/path/to/node'
   end
 
   it 'requests specific items from a node' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Items
-      n.find("/iq/ns:pubsub/ns:items[@node='/path/to/node'][ns:item[@id='item1']][ns:item[@id='item2']]", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :get
+      n.should be_instance_of Blather::Stanza::PubSub::Items
+      n.find("/iq/ns:pubsub/ns:items[@node='/path/to/node'][ns:item[@id='item1']][ns:item[@id='item2']]", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :get
     end
     @pubsub.items '/path/to/node', %w[item1 item2]
   end
 
   it 'requests some items from a node' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Items
-      n.find("/iq/ns:pubsub/ns:items[@node='/path/to/node' and @max_items='2']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :get
+      n.should be_instance_of Blather::Stanza::PubSub::Items
+      n.find("/iq/ns:pubsub/ns:items[@node='/path/to/node' and @max_items='2']", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :get
     end
     @pubsub.items '/path/to/node', nil, 2
   end
 
   it 'can publish items to a node with a hash' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Publish
-      n.find("/iq[@type='set']/ns:pubsub/ns:publish[@node='/path/to/node' and ns:item[@id='id1' and .='payload1'] and ns:item[@id='id2' and .='payload2']]", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSub::Publish
+      n.find("/iq[@type='set']/ns:pubsub/ns:publish[@node='/path/to/node' and ns:item[@id='id1' and .='payload1'] and ns:item[@id='id2' and .='payload2']]", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.publish '/path/to/node', {'id1' => 'payload1', 'id2' => 'payload2'}
   end
 
   it 'can publish items to a node with an array' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Publish
-      n.find("/iq[@type='set']/ns:pubsub/ns:publish[@node='/path/to/node' and ns:item[.='payload1'] and ns:item[.='payload2']]", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSub::Publish
+      n.find("/iq[@type='set']/ns:pubsub/ns:publish[@node='/path/to/node' and ns:item[.='payload1'] and ns:item[.='payload2']]", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.publish '/path/to/node', %w[payload1 payload2]
   end
 
   it 'can publish items to a node with a string' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Publish
-      n.find("/iq[@type='set']/ns:pubsub/ns:publish[@node='/path/to/node' and ns:item[.='payload']]", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSub::Publish
+      n.find("/iq[@type='set']/ns:pubsub/ns:publish[@node='/path/to/node' and ns:item[.='payload']]", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.publish '/path/to/node', 'payload'
   end
 
   it 'can retract an item with an array' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Retract
-      n.find("/iq[@type='set']/ns:pubsub/ns:retract[@node='/path/to/node' and ns:item[@id='id1'] and ns:item[@id='id2']]", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSub::Retract
+      n.find("/iq[@type='set']/ns:pubsub/ns:retract[@node='/path/to/node' and ns:item[@id='id1'] and ns:item[@id='id2']]", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.retract '/path/to/node', %w[id1 id2]
   end
 
   it 'can retract an item with a string' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Retract
-      n.find("/iq[@type='set']/ns:pubsub/ns:retract[@node='/path/to/node' and ns:item[@id='id1']]", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSub::Retract
+      n.find("/iq[@type='set']/ns:pubsub/ns:retract[@node='/path/to/node' and ns:item[@id='id1']]", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.retract '/path/to/node', 'id1'
   end
 
   it 'can subscribe to a node with the default jid' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Subscribe
-      n.find("/iq[@type='set']/ns:pubsub/ns:subscribe[@node='/path/to/node' and @jid='#{@client.jid.stripped}']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSub::Subscribe
+      n.find("/iq[@type='set']/ns:pubsub/ns:subscribe[@node='/path/to/node' and @jid='#{@client.jid.stripped}']", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.subscribe '/path/to/node'
   end
 
   it 'can subscribe to a node with a specified jid as a string' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Subscribe
-      n.find("/iq[@type='set']/ns:pubsub/ns:subscribe[@node='/path/to/node' and @jid='jid@d/r']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSub::Subscribe
+      n.find("/iq[@type='set']/ns:pubsub/ns:subscribe[@node='/path/to/node' and @jid='jid@d/r']", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.subscribe '/path/to/node', 'jid@d/r'
   end
 
   it 'can subscribe to a node with a specified jid as a Blather::JID' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Subscribe
-      n.find("/iq[@type='set']/ns:pubsub/ns:subscribe[@node='/path/to/node' and @jid='jid@d/r']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSub::Subscribe
+      n.find("/iq[@type='set']/ns:pubsub/ns:subscribe[@node='/path/to/node' and @jid='jid@d/r']", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.subscribe '/path/to/node', Blather::JID.new('jid@d/r')
   end
 
   it 'can unsubscribe to a node with the default jid' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Unsubscribe
-      n.find("/iq[@type='set']/ns:pubsub/ns:unsubscribe[@node='/path/to/node' and @jid='#{@client.jid.stripped}']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSub::Unsubscribe
+      n.find("/iq[@type='set']/ns:pubsub/ns:unsubscribe[@node='/path/to/node' and @jid='#{@client.jid.stripped}']", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.unsubscribe '/path/to/node'
   end
 
   it 'can unsubscribe to a node with a specified jid as a string' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Unsubscribe
-      n.find("/iq[@type='set']/ns:pubsub/ns:unsubscribe[@node='/path/to/node' and @jid='jid@d/r']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSub::Unsubscribe
+      n.find("/iq[@type='set']/ns:pubsub/ns:unsubscribe[@node='/path/to/node' and @jid='jid@d/r']", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.unsubscribe '/path/to/node', 'jid@d/r'
   end
 
   it 'can unsubscribe to a node with a specified jid as a Blather::JID' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Unsubscribe
-      n.find("/iq[@type='set']/ns:pubsub/ns:unsubscribe[@node='/path/to/node' and @jid='jid@d/r']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSub::Unsubscribe
+      n.find("/iq[@type='set']/ns:pubsub/ns:unsubscribe[@node='/path/to/node' and @jid='jid@d/r']", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.unsubscribe '/path/to/node', Blather::JID.new('jid@d/r')
   end
 
   it 'can unsubscribe with a particular subscription id' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Unsubscribe
-      n.find("/iq[@type='set']/ns:pubsub/ns:unsubscribe[@node='/path/to/node' and @jid='jid@d/r' and @subid='subid']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.subid.must_equal 'subid'
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSub::Unsubscribe
+      n.find("/iq[@type='set']/ns:pubsub/ns:unsubscribe[@node='/path/to/node' and @jid='jid@d/r' and @subid='subid']", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.subid.should == 'subid'
+      n.type.should == :set
     end
     @pubsub.unsubscribe '/path/to/node', 'jid@d/r', 'subid'
   end
 
   it 'can purge a node' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSubOwner::Purge
-      n.find("/iq[@type='set']/ns:pubsub/ns:purge[@node='/path/to/node']", :ns => Blather::Stanza::PubSubOwner.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSubOwner::Purge
+      n.find("/iq[@type='set']/ns:pubsub/ns:purge[@node='/path/to/node']", :ns => Blather::Stanza::PubSubOwner.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.purge '/path/to/node'
   end
 
   it 'can create a node' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSub::Create
-      n.find("/iq[@type='set']/ns:pubsub/ns:create[@node='/path/to/node']", :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSub::Create
+      n.find("/iq[@type='set']/ns:pubsub/ns:create[@node='/path/to/node']", :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.create '/path/to/node'
   end
 
   it 'can delete a node' do
     @client.expects(:write_with_handler).with do |n|
-      n.must_be_instance_of Blather::Stanza::PubSubOwner::Delete
-      n.find("/iq[@type='set']/ns:pubsub/ns:delete[@node='/path/to/node']", :ns => Blather::Stanza::PubSubOwner.registered_ns).wont_be_empty
-      n.to.must_equal Blather::JID.new(@host)
-      n.type.must_equal :set
+      n.should be_instance_of Blather::Stanza::PubSubOwner::Delete
+      n.find("/iq[@type='set']/ns:pubsub/ns:delete[@node='/path/to/node']", :ns => Blather::Stanza::PubSubOwner.registered_ns).should_not be_empty
+      n.to.should == Blather::JID.new(@host)
+      n.type.should == :set
     end
     @pubsub.delete '/path/to/node'
   end
@@ -287,9 +287,9 @@ describe 'Blather::DSL::PubSub callbacks' do
   end
 
   it 'returns a list of affiliations when requesting affiliations' do
-    affiliations = Blather::XMPPNode.import(parse_stanza(affiliations_xml).root)
+    affiliations = Blather::XMPPNode.parse(affiliations_xml)
     response = mock()
-    response.expects(:call).with { |n| n.must_equal affiliations.list }
+    response.expects(:call).with { |n| n.should == affiliations.list }
     @client.stubs(:write).with do |n|
       affiliations.id = n.id
       @client.receive_data affiliations
@@ -299,9 +299,9 @@ describe 'Blather::DSL::PubSub callbacks' do
   end
 
   it 'returns a list of subscriptions when requesting subscriptions' do
-    subscriptions = Blather::XMPPNode.import(parse_stanza(subscriptions_xml).root)
+    subscriptions = Blather::XMPPNode.parse(subscriptions_xml)
     response = mock()
-    response.expects(:call).with { |n| n.must_equal subscriptions.list }
+    response.expects(:call).with { |n| n.should == subscriptions.list }
     @client.stubs(:write).with do |n|
       subscriptions.id = n.id
       @client.receive_data subscriptions
@@ -311,7 +311,7 @@ describe 'Blather::DSL::PubSub callbacks' do
   end
 
   it 'returns a list of node items when requesting nodes' do
-    nodes = Blather::XMPPNode.import(parse_stanza(<<-NODES).root)
+    nodes = Blather::XMPPNode.parse(<<-NODES)
     <iq type='result'
         from='pubsub.shakespeare.lit'
         to='francisco@denmark.lit/barracks'
@@ -327,7 +327,7 @@ describe 'Blather::DSL::PubSub callbacks' do
     </iq>
     NODES
     response = mock()
-    response.expects(:call).with { |n| n.must_equal nodes.items }
+    response.expects(:call).with { |n| n.should == nodes.items }
     @client.stubs(:write).with do |n|
       nodes.id = n.id
       @client.receive_data nodes
@@ -337,7 +337,7 @@ describe 'Blather::DSL::PubSub callbacks' do
   end
 
   it 'returns a DiscoInfo node when requesting a node' do
-    node = Blather::XMPPNode.import(parse_stanza(<<-NODES).root)
+    node = Blather::XMPPNode.parse(<<-NODES)
     <iq type='result'
         from='pubsub.shakespeare.lit'
         to='francisco@denmark.lit/barracks'
@@ -349,7 +349,7 @@ describe 'Blather::DSL::PubSub callbacks' do
     </iq>
     NODES
     response = mock()
-    response.expects(:call).with { |n| n.must_equal node }
+    response.expects(:call).with { |n| n.should == node }
     @client.stubs(:write).with do |n|
       node.id = n.id
       @client.receive_data node
@@ -359,9 +359,9 @@ describe 'Blather::DSL::PubSub callbacks' do
   end
 
   it 'returns a set of items when requesting items' do
-    items = Blather::XMPPNode.import(parse_stanza(items_all_nodes_xml).root)
+    items = Blather::XMPPNode.parse(items_all_nodes_xml)
     response = mock()
-    response.expects(:call).with { |n| n.map{|i|i.to_s}.must_equal items.items.map{|i|i.to_s} }
+    response.expects(:call).with { |n| n.map{|i|i.to_s}.should == items.items.map{|i|i.to_s} }
     @client.stubs(:write).with do |n|
       items.id = n.id
       @client.receive_data items
@@ -371,9 +371,9 @@ describe 'Blather::DSL::PubSub callbacks' do
   end
 
   it 'returns aa subscription node when subscribing' do
-    subscription = Blather::XMPPNode.import(parse_stanza(subscription_xml).root)
+    subscription = Blather::XMPPNode.parse(subscription_xml)
     response = mock()
-    response.expects(:call).with { |n| n.must_equal subscription }
+    response.expects(:call).with { |n| n.should == subscription }
     @client.stubs(:write).with do |n|
       subscription.id = n.id
       @client.receive_data subscription
@@ -383,9 +383,9 @@ describe 'Blather::DSL::PubSub callbacks' do
   end
 
   it 'returns aa unsubscribe node when unsubscribing' do
-    unsubscribe = Blather::XMPPNode.import(parse_stanza(unsubscribe_xml).root)
+    unsubscribe = Blather::XMPPNode.parse(unsubscribe_xml)
     response = mock()
-    response.expects(:call).with { |n| n.must_equal unsubscribe }
+    response.expects(:call).with { |n| n.should == unsubscribe }
     @client.stubs(:write).with do |n|
       unsubscribe.id = n.id
       @client.receive_data unsubscribe
@@ -395,7 +395,7 @@ describe 'Blather::DSL::PubSub callbacks' do
   end
 
   it 'returns a publish result when publishing to a node' do
-    result = Blather::XMPPNode.import(parse_stanza(<<-NODE).root)
+    result = Blather::XMPPNode.parse(<<-NODE)
     <iq type='result'
         from='pubsub.shakespeare.lit'
         to='hamlet@denmark.lit/blogbot'
@@ -408,7 +408,7 @@ describe 'Blather::DSL::PubSub callbacks' do
     </iq>
     NODE
     response = mock()
-    response.expects(:call).with { |n| n.must_equal result }
+    response.expects(:call).with { |n| n.should == result }
     @client.stubs(:write).with do |n|
       result.id = n.id
       @client.receive_data result
@@ -418,7 +418,7 @@ describe 'Blather::DSL::PubSub callbacks' do
   end
 
   it 'returns a create result when creating a node' do
-    result = Blather::XMPPNode.import(parse_stanza(<<-NODE).root)
+    result = Blather::XMPPNode.parse(<<-NODE)
     <iq type='result'
         from='pubsub.shakespeare.lit'
         to='hamlet@denmark.lit/elsinore'
@@ -429,7 +429,7 @@ describe 'Blather::DSL::PubSub callbacks' do
     </iq>
     NODE
     response = mock()
-    response.expects(:call).with { |n| n.must_equal result }
+    response.expects(:call).with { |n| n.should == result }
     @client.stubs(:write).with do |n|
       result.id = n.id
       @client.receive_data result
@@ -439,13 +439,13 @@ describe 'Blather::DSL::PubSub callbacks' do
   end
 
   it 'returns a purge result when purging a node' do
-    result = Blather::XMPPNode.import(parse_stanza(<<-NODE).root)
+    result = Blather::XMPPNode.parse(<<-NODE)
     <iq type='result'
         from='pubsub.shakespeare.lit'
         id='purge1'/>
     NODE
     response = mock()
-    response.expects(:call).with { |n| n.must_equal result }
+    response.expects(:call).with { |n| n.should == result }
     @client.stubs(:write).with do |n|
       result.id = n.id
       @client.receive_data result
@@ -455,13 +455,13 @@ describe 'Blather::DSL::PubSub callbacks' do
   end
 
   it 'returns a delete result when deleting a node' do
-    result = Blather::XMPPNode.import(parse_stanza(<<-NODE).root)
+    result = Blather::XMPPNode.parse(<<-NODE)
     <iq type='result'
         from='pubsub.shakespeare.lit'
         id='delete1'/>
     NODE
     response = mock()
-    response.expects(:call).with { |n| n.must_equal result }
+    response.expects(:call).with { |n| n.should == result }
     @client.stubs(:write).with do |n|
       result.id = n.id
       @client.receive_data result