blather 0.6.2 → 0.7.0

data/spec/blather/stanza/pubsub/publish_spec.rb

@@ -3,81 +3,81 @@ require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Publish do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:publish, 'http://jabber.org/protocol/pubsub').must_equal Blather::Stanza::PubSub::Publish
+    Blather::XMPPNode.class_from_registration(:publish, 'http://jabber.org/protocol/pubsub').should == Blather::Stanza::PubSub::Publish
   end
 
   it 'can be imported' do
-    Blather::XMPPNode.import(parse_stanza(publish_xml).root).must_be_instance_of Blather::Stanza::PubSub::Publish
+    Blather::XMPPNode.parse(publish_xml).should be_instance_of Blather::Stanza::PubSub::Publish
   end
 
   it 'ensures an publish node is present on create' do
     publish = Blather::Stanza::PubSub::Publish.new
-    publish.find('//ns:pubsub/ns:publish', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    publish.find('//ns:pubsub/ns:publish', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'ensures an publish node exists when calling #publish' do
     publish = Blather::Stanza::PubSub::Publish.new
     publish.pubsub.remove_children :publish
-    publish.find('//ns:pubsub/ns:publish', :ns => Blather::Stanza::PubSub.registered_ns).must_be_empty
+    publish.find('//ns:pubsub/ns:publish', :ns => Blather::Stanza::PubSub.registered_ns).should be_empty
 
-    publish.publish.wont_be_nil
-    publish.find('//ns:pubsub/ns:publish', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    publish.publish.should_not be_nil
+    publish.find('//ns:pubsub/ns:publish', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'defaults to a set node' do
     publish = Blather::Stanza::PubSub::Publish.new
-    publish.type.must_equal :set
+    publish.type.should == :set
   end
 
   it 'sets the host if requested' do
     publish = Blather::Stanza::PubSub::Publish.new 'pubsub.jabber.local'
-    publish.to.must_equal Blather::JID.new('pubsub.jabber.local')
+    publish.to.should == Blather::JID.new('pubsub.jabber.local')
   end
 
   it 'sets the node' do
     publish = Blather::Stanza::PubSub::Publish.new 'host', 'node-name'
-    publish.node.must_equal 'node-name'
+    publish.node.should == 'node-name'
   end
 
   it 'will iterate over each item' do
     publish = Blather::Stanza::PubSub::Publish.new.inherit parse_stanza(publish_xml).root
     count = 0
     publish.each do |i|
-      i.must_be_instance_of Blather::Stanza::PubSub::PubSubItem
+      i.should be_instance_of Blather::Stanza::PubSub::PubSubItem
       count += 1
     end
-    count.must_equal 1
+    count.should == 1
   end
 
   it 'has a node attribute' do
     publish = Blather::Stanza::PubSub::Publish.new
-    publish.must_respond_to :node
-    publish.node.must_be_nil
+    publish.should respond_to :node
+    publish.node.should be_nil
     publish.node = 'node-name'
-    publish.node.must_equal 'node-name'
-    publish.xpath('//ns:publish[@node="node-name"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    publish.node.should == 'node-name'
+    publish.xpath('//ns:publish[@node="node-name"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'can set the payload with a hash' do
     payload = {'id1' => 'payload1', 'id2' => 'payload2'}
     publish = Blather::Stanza::PubSub::Publish.new
     publish.payload = payload
-    publish.size.must_equal 2
-    publish.xpath('/iq/ns:pubsub/ns:publish[ns:item[@id="id1" and .="payload1"] and ns:item[@id="id2" and .="payload2"]]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    publish.size.should == 2
+    publish.xpath('/iq/ns:pubsub/ns:publish[ns:item[@id="id1" and .="payload1"] and ns:item[@id="id2" and .="payload2"]]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'can set the payload with an array' do
     payload = %w[payload1 payload2]
     publish = Blather::Stanza::PubSub::Publish.new
     publish.payload = payload
-    publish.size.must_equal 2
-    publish.xpath('/iq/ns:pubsub/ns:publish[ns:item[.="payload1"] and ns:item[.="payload2"]]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    publish.size.should == 2
+    publish.xpath('/iq/ns:pubsub/ns:publish[ns:item[.="payload1"] and ns:item[.="payload2"]]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'can set the payload with a string' do
     publish = Blather::Stanza::PubSub::Publish.new
     publish.payload = 'payload'
-    publish.size.must_equal 1
-    publish.xpath('/iq/ns:pubsub/ns:publish[ns:item[.="payload"]]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    publish.size.should == 1
+    publish.xpath('/iq/ns:pubsub/ns:publish[ns:item[.="payload"]]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 end

data/spec/blather/stanza/pubsub/retract_spec.rb

@@ -3,73 +3,73 @@ require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Retract do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:retract, 'http://jabber.org/protocol/pubsub').must_equal Blather::Stanza::PubSub::Retract
+    Blather::XMPPNode.class_from_registration(:retract, 'http://jabber.org/protocol/pubsub').should == Blather::Stanza::PubSub::Retract
   end
 
   it 'can be imported' do
-    Blather::XMPPNode.import(parse_stanza(retract_xml).root).must_be_instance_of Blather::Stanza::PubSub::Retract
+    Blather::XMPPNode.parse(retract_xml).should be_instance_of Blather::Stanza::PubSub::Retract
   end
 
   it 'ensures an retract node is present on create' do
     retract = Blather::Stanza::PubSub::Retract.new
-    retract.find('//ns:pubsub/ns:retract', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    retract.find('//ns:pubsub/ns:retract', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'ensures an retract node exists when calling #retract' do
     retract = Blather::Stanza::PubSub::Retract.new
     retract.pubsub.remove_children :retract
-    retract.find('//ns:pubsub/ns:retract', :ns => Blather::Stanza::PubSub.registered_ns).must_be_empty
+    retract.find('//ns:pubsub/ns:retract', :ns => Blather::Stanza::PubSub.registered_ns).should be_empty
 
-    retract.retract.wont_be_nil
-    retract.find('//ns:pubsub/ns:retract', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    retract.retract.should_not be_nil
+    retract.find('//ns:pubsub/ns:retract', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'defaults to a set node' do
     retract = Blather::Stanza::PubSub::Retract.new
-    retract.type.must_equal :set
+    retract.type.should == :set
   end
 
   it 'sets the host if requested' do
     retract = Blather::Stanza::PubSub::Retract.new 'pubsub.jabber.local'
-    retract.to.must_equal Blather::JID.new('pubsub.jabber.local')
+    retract.to.should == Blather::JID.new('pubsub.jabber.local')
   end
 
   it 'sets the node' do
     retract = Blather::Stanza::PubSub::Retract.new 'host', 'node-name'
-    retract.node.must_equal 'node-name'
+    retract.node.should == 'node-name'
   end
 
   it 'can set the retractions as a string' do
     retract = Blather::Stanza::PubSub::Retract.new 'host', 'node'
     retract.retractions = 'id1'
-    retract.xpath('//ns:retract[ns:item[@id="id1"]]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    retract.xpath('//ns:retract[ns:item[@id="id1"]]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'can set the retractions as an array' do
     retract = Blather::Stanza::PubSub::Retract.new 'host', 'node'
     retract.retractions = %w[id1 id2]
-    retract.xpath('//ns:retract[ns:item[@id="id1"] and ns:item[@id="id2"]]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    retract.xpath('//ns:retract[ns:item[@id="id1"] and ns:item[@id="id2"]]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'will iterate over each item' do
     retract = Blather::Stanza::PubSub::Retract.new.inherit parse_stanza(retract_xml).root
-    retract.retractions.size.must_equal 1
-    retract.size.must_equal retract.retractions.size
-    retract.retractions.must_equal %w[ae890ac52d0df67ed7cfdf51b644e901]
+    retract.retractions.size.should == 1
+    retract.size.should == retract.retractions.size
+    retract.retractions.should == %w[ae890ac52d0df67ed7cfdf51b644e901]
   end
 
   it 'has a node attribute' do
     retract = Blather::Stanza::PubSub::Retract.new
-    retract.must_respond_to :node
-    retract.node.must_be_nil
+    retract.should respond_to :node
+    retract.node.should be_nil
     retract.node = 'node-name'
-    retract.node.must_equal 'node-name'
-    retract.xpath('//ns:retract[@node="node-name"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    retract.node.should == 'node-name'
+    retract.xpath('//ns:retract[@node="node-name"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'will iterate over each retraction' do
-    Blather::XMPPNode.import(parse_stanza(retract_xml).root).each do |i|
-      i.must_include "ae890ac52d0df67ed7cfdf51b644e901"
+    Blather::XMPPNode.parse(retract_xml).each do |i|
+      i.should include "ae890ac52d0df67ed7cfdf51b644e901"
     end
   end
 end

data/spec/blather/stanza/pubsub/subscribe_spec.rb

@@ -3,59 +3,59 @@ require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Subscribe do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:subscribe, 'http://jabber.org/protocol/pubsub').must_equal Blather::Stanza::PubSub::Subscribe
+    Blather::XMPPNode.class_from_registration(:subscribe, 'http://jabber.org/protocol/pubsub').should == Blather::Stanza::PubSub::Subscribe
   end
 
   it 'can be imported' do
-    Blather::XMPPNode.import(parse_stanza(subscribe_xml).root).must_be_instance_of Blather::Stanza::PubSub::Subscribe
+    Blather::XMPPNode.parse(subscribe_xml).should be_instance_of Blather::Stanza::PubSub::Subscribe
   end
 
   it 'ensures an subscribe node is present on create' do
     subscribe = Blather::Stanza::PubSub::Subscribe.new :set, 'host', 'node', 'jid'
-    subscribe.find('//ns:pubsub/ns:subscribe', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    subscribe.find('//ns:pubsub/ns:subscribe', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'ensures an subscribe node exists when calling #subscribe' do
     subscribe = Blather::Stanza::PubSub::Subscribe.new :set, 'host', 'node', 'jid'
     subscribe.pubsub.remove_children :subscribe
-    subscribe.find('//ns:pubsub/ns:subscribe', :ns => Blather::Stanza::PubSub.registered_ns).must_be_empty
+    subscribe.find('//ns:pubsub/ns:subscribe', :ns => Blather::Stanza::PubSub.registered_ns).should be_empty
 
-    subscribe.subscribe.wont_be_nil
-    subscribe.find('//ns:pubsub/ns:subscribe', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    subscribe.subscribe.should_not be_nil
+    subscribe.find('//ns:pubsub/ns:subscribe', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'defaults to a set node' do
     subscribe = Blather::Stanza::PubSub::Subscribe.new :set, 'host', 'node', 'jid'
-    subscribe.type.must_equal :set
+    subscribe.type.should == :set
   end
 
   it 'sets the host if requested' do
     subscribe = Blather::Stanza::PubSub::Subscribe.new :set, 'pubsub.jabber.local', 'node', 'jid'
-    subscribe.to.must_equal Blather::JID.new('pubsub.jabber.local')
+    subscribe.to.should == Blather::JID.new('pubsub.jabber.local')
   end
 
   it 'sets the node' do
     subscribe = Blather::Stanza::PubSub::Subscribe.new :set, 'host', 'node-name', 'jid'
-    subscribe.node.must_equal 'node-name'
+    subscribe.node.should == 'node-name'
   end
 
   it 'has a node attribute' do
     subscribe = Blather::Stanza::PubSub::Subscribe.new :set, 'host', 'node-name', 'jid'
-    subscribe.find('//ns:pubsub/ns:subscribe[@node="node-name"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-    subscribe.node.must_equal 'node-name'
+    subscribe.find('//ns:pubsub/ns:subscribe[@node="node-name"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    subscribe.node.should == 'node-name'
 
     subscribe.node = 'new-node'
-    subscribe.find('//ns:pubsub/ns:subscribe[@node="new-node"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-    subscribe.node.must_equal 'new-node'
+    subscribe.find('//ns:pubsub/ns:subscribe[@node="new-node"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    subscribe.node.should == 'new-node'
   end
 
   it 'has a jid attribute' do
     subscribe = Blather::Stanza::PubSub::Subscribe.new :set, 'host', 'node-name', 'jid'
-    subscribe.find('//ns:pubsub/ns:subscribe[@jid="jid"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-    subscribe.jid.must_equal Blather::JID.new('jid')
+    subscribe.find('//ns:pubsub/ns:subscribe[@jid="jid"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    subscribe.jid.should == Blather::JID.new('jid')
 
     subscribe.jid = Blather::JID.new('n@d/r')
-    subscribe.find('//ns:pubsub/ns:subscribe[@jid="n@d/r"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-    subscribe.jid.must_equal Blather::JID.new('n@d/r')
+    subscribe.find('//ns:pubsub/ns:subscribe[@jid="n@d/r"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    subscribe.jid.should == Blather::JID.new('n@d/r')
   end
 end

data/spec/blather/stanza/pubsub/subscription_spec.rb

@@ -3,94 +3,94 @@ require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Subscription do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:subscription, 'http://jabber.org/protocol/pubsub').must_equal Blather::Stanza::PubSub::Subscription
+    Blather::XMPPNode.class_from_registration(:subscription, 'http://jabber.org/protocol/pubsub').should == Blather::Stanza::PubSub::Subscription
   end
 
   it 'can be imported' do
-    Blather::XMPPNode.import(parse_stanza(subscription_xml).root).must_be_instance_of Blather::Stanza::PubSub::Subscription
+    Blather::XMPPNode.parse(subscription_xml).should be_instance_of Blather::Stanza::PubSub::Subscription
   end
 
   it 'ensures an subscription node is present on create' do
     subscription = Blather::Stanza::PubSub::Subscription.new :set, 'host', 'node', 'jid', 'subid', :none
-    subscription.find('//ns:pubsub/ns:subscription', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    subscription.find('//ns:pubsub/ns:subscription', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'ensures an subscription node exists when calling #subscription_node' do
     subscription = Blather::Stanza::PubSub::Subscription.new :set, 'host', 'node', 'jid', 'subid', :none
     subscription.pubsub.remove_children :subscription
-    subscription.find('//ns:pubsub/ns:subscription', :ns => Blather::Stanza::PubSub.registered_ns).must_be_empty
+    subscription.find('//ns:pubsub/ns:subscription', :ns => Blather::Stanza::PubSub.registered_ns).should be_empty
 
-    subscription.subscription_node.wont_be_nil
-    subscription.find('//ns:pubsub/ns:subscription', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    subscription.subscription_node.should_not be_nil
+    subscription.find('//ns:pubsub/ns:subscription', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'defaults to a set node' do
     subscription = Blather::Stanza::PubSub::Subscription.new :set, 'host', 'node', 'jid', 'subid', :none
-    subscription.type.must_equal :set
+    subscription.type.should == :set
   end
 
   it 'sets the host if requested' do
     subscription = Blather::Stanza::PubSub::Subscription.new :set, 'pubsub.jabber.local', 'node', 'jid', 'subid', :none
-    subscription.to.must_equal Blather::JID.new('pubsub.jabber.local')
+    subscription.to.should == Blather::JID.new('pubsub.jabber.local')
   end
 
   it 'sets the node' do
     subscription = Blather::Stanza::PubSub::Subscription.new :set, 'host', 'node-name', 'jid', 'subid', :none
-    subscription.node.must_equal 'node-name'
+    subscription.node.should == 'node-name'
   end
 
   it 'has a node attribute' do
     subscription = Blather::Stanza::PubSub::Subscription.new :set, 'host', 'node-name', 'jid', 'subid', :none
-    subscription.find('//ns:pubsub/ns:subscription[@node="node-name"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-    subscription.node.must_equal 'node-name'
+    subscription.find('//ns:pubsub/ns:subscription[@node="node-name"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    subscription.node.should == 'node-name'
 
     subscription.node = 'new-node'
-    subscription.find('//ns:pubsub/ns:subscription[@node="new-node"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-    subscription.node.must_equal 'new-node'
+    subscription.find('//ns:pubsub/ns:subscription[@node="new-node"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    subscription.node.should == 'new-node'
   end
 
   it 'has a jid attribute' do
     subscription = Blather::Stanza::PubSub::Subscription.new :set, 'host', 'node-name', 'jid', 'subid', :none
-    subscription.find('//ns:pubsub/ns:subscription[@jid="jid"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-    subscription.jid.must_equal Blather::JID.new('jid')
+    subscription.find('//ns:pubsub/ns:subscription[@jid="jid"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    subscription.jid.should == Blather::JID.new('jid')
 
     subscription.jid = Blather::JID.new('n@d/r')
-    subscription.find('//ns:pubsub/ns:subscription[@jid="n@d/r"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-    subscription.jid.must_equal Blather::JID.new('n@d/r')
+    subscription.find('//ns:pubsub/ns:subscription[@jid="n@d/r"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    subscription.jid.should == Blather::JID.new('n@d/r')
   end
 
   it 'has a subid attribute' do
     subscription = Blather::Stanza::PubSub::Subscription.new :set, 'host', 'node-name', 'jid', 'subid', :none
-    subscription.find('//ns:pubsub/ns:subscription[@subid="subid"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-    subscription.subid.must_equal 'subid'
+    subscription.find('//ns:pubsub/ns:subscription[@subid="subid"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    subscription.subid.should == 'subid'
 
     subscription.subid = 'new-subid'
-    subscription.find('//ns:pubsub/ns:subscription[@subid="new-subid"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-    subscription.subid.must_equal 'new-subid'
+    subscription.find('//ns:pubsub/ns:subscription[@subid="new-subid"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    subscription.subid.should == 'new-subid'
   end
 
   it 'has a subscription attribute' do
     subscription = Blather::Stanza::PubSub::Subscription.new :set, 'host', 'node-name', 'jid', 'subid', :none
-    subscription.find('//ns:pubsub/ns:subscription[@subscription="none"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-    subscription.subscription.must_equal :none
+    subscription.find('//ns:pubsub/ns:subscription[@subscription="none"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    subscription.subscription.should == :none
 
     subscription.subscription = :pending
-    subscription.find('//ns:pubsub/ns:subscription[@subscription="pending"]', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
-    subscription.subscription.must_equal :pending
+    subscription.find('//ns:pubsub/ns:subscription[@subscription="pending"]', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
+    subscription.subscription.should == :pending
   end
 
   it 'ensures subscription is one of Stanza::PubSub::Subscription::VALID_TYPES' do
-    lambda { Blather::Stanza::PubSub::Subscription.new :set, 'host', 'node-name', 'jid', 'subid', :invalid_type_name }.must_raise(Blather::ArgumentError)
+    lambda { Blather::Stanza::PubSub::Subscription.new :set, 'host', 'node-name', 'jid', 'subid', :invalid_type_name }.should raise_error(Blather::ArgumentError)
 
     Blather::Stanza::PubSub::Subscription::VALID_TYPES.each do |valid_type|
       n = Blather::Stanza::PubSub::Subscription.new :set, 'host', 'node-name', 'jid', 'subid', valid_type
-      n.subscription.must_equal valid_type
+      n.subscription.should == valid_type
     end
   end
 
   Blather::Stanza::PubSub::Subscription::VALID_TYPES.each do |valid_type|
     it "provides a helper (#{valid_type}?) for type #{valid_type}" do
-      Blather::Stanza::PubSub::Subscription.new.must_respond_to :"#{valid_type}?"
+      Blather::Stanza::PubSub::Subscription.new.should respond_to :"#{valid_type}?"
     end
   end
 

data/spec/blather/stanza/pubsub/subscriptions_spec.rb

@@ -10,50 +10,50 @@ end
 
 describe Blather::Stanza::PubSub::Subscriptions do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:subscriptions, 'http://jabber.org/protocol/pubsub').must_equal Blather::Stanza::PubSub::Subscriptions
+    Blather::XMPPNode.class_from_registration(:subscriptions, 'http://jabber.org/protocol/pubsub').should == Blather::Stanza::PubSub::Subscriptions
   end
 
   it 'can be imported' do
-    Blather::XMPPNode.import(parse_stanza(subscriptions_xml).root).must_be_instance_of Blather::Stanza::PubSub::Subscriptions
+    Blather::XMPPNode.parse(subscriptions_xml).should be_instance_of Blather::Stanza::PubSub::Subscriptions
   end
 
   it 'ensures an subscriptions node is present on create' do
     subscriptions = Blather::Stanza::PubSub::Subscriptions.new
-    subscriptions.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    subscriptions.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'ensures an subscriptions node exists when calling #subscriptions' do
     subscriptions = Blather::Stanza::PubSub::Subscriptions.new
     subscriptions.pubsub.remove_children :subscriptions
-    subscriptions.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).must_be_empty
+    subscriptions.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).should be_empty
 
-    subscriptions.subscriptions.wont_be_nil
-    subscriptions.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).wont_be_empty
+    subscriptions.subscriptions.should_not be_nil
+    subscriptions.find('//ns:pubsub/ns:subscriptions', :ns => Blather::Stanza::PubSub.registered_ns).should_not be_empty
   end
 
   it 'defaults to a get node' do
     aff = Blather::Stanza::PubSub::Subscriptions.new
-    aff.type.must_equal :get
+    aff.type.should == :get
   end
 
   it 'sets the host if requested' do
     aff = Blather::Stanza::PubSub::Subscriptions.new :get, 'pubsub.jabber.local'
-    aff.to.must_equal Blather::JID.new('pubsub.jabber.local')
+    aff.to.should == Blather::JID.new('pubsub.jabber.local')
   end
 
   it 'can import a subscriptions result node' do
     node = parse_stanza(subscriptions_xml).root
 
     subscriptions = Blather::Stanza::PubSub::Subscriptions.new.inherit node
-    subscriptions.size.must_equal 4
-    subscriptions.list.must_equal control_subscriptions
+    subscriptions.size.should == 4
+    subscriptions.list.should == control_subscriptions
   end
 
   it 'will iterate over each subscription' do
     node = parse_stanza(subscriptions_xml).root
     subscriptions = Blather::Stanza::PubSub::Subscriptions.new.inherit node
     subscriptions.each do |type, nodes|
-      nodes.must_equal control_subscriptions[type]
+      nodes.should == control_subscriptions[type]
     end
   end
 end