spec/blather/stanza/pubsub/event_spec.rb in blather-1.2.0 vs spec/blather/stanza/pubsub/event_spec.rb in blather-2.0.0

@@ -1,60 +1,60 @@
 require 'spec_helper'
 require 'fixtures/pubsub'
 
 describe Blather::Stanza::PubSub::Event do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:event, 'http://jabber.org/protocol/pubsub#event').should == Blather::Stanza::PubSub::Event
+    expect(Blather::XMPPNode.class_from_registration(:event, 'http://jabber.org/protocol/pubsub#event')).to eq(Blather::Stanza::PubSub::Event)
   end
 
   it 'is importable' do
-    Blather::XMPPNode.parse(event_notification_xml).should be_instance_of Blather::Stanza::PubSub::Event
+    expect(Blather::XMPPNode.parse(event_notification_xml)).to be_instance_of Blather::Stanza::PubSub::Event
   end
 
   it 'ensures a query node is present on create' do
     evt = Blather::Stanza::PubSub::Event.new
-    evt.find('ns:event', :ns => Blather::Stanza::PubSub::Event.registered_ns).should_not be_empty
+    expect(evt.find('ns:event', :ns => Blather::Stanza::PubSub::Event.registered_ns)).not_to be_empty
   end
 
   it 'ensures an event node exists when calling #event_node' do
     evt = Blather::Stanza::PubSub::Event.new
     evt.remove_children :event
-    evt.find('*[local-name()="event"]').should be_empty
+    expect(evt.find('*[local-name()="event"]')).to be_empty
 
-    evt.event_node.should_not be_nil
-    evt.find('ns:event', :ns => Blather::Stanza::PubSub::Event.registered_ns).should_not be_empty
+    expect(evt.event_node).not_to be_nil
+    expect(evt.find('ns:event', :ns => Blather::Stanza::PubSub::Event.registered_ns)).not_to be_empty
   end
 
   it 'ensures an items node exists when calling #items_node' do
     evt = Blather::Stanza::PubSub::Event.new
     evt.remove_children :items
-    evt.find('*[local-name()="items"]').should be_empty
+    expect(evt.find('*[local-name()="items"]')).to be_empty
 
-    evt.items_node.should_not be_nil
-    evt.find('ns:event/ns:items', :ns => Blather::Stanza::PubSub::Event.registered_ns).should_not be_empty
+    expect(evt.items_node).not_to be_nil
+    expect(evt.find('ns:event/ns:items', :ns => Blather::Stanza::PubSub::Event.registered_ns)).not_to be_empty
   end
 
   it 'knows the associated node name' do
     evt = Blather::XMPPNode.parse(event_with_payload_xml)
-    evt.node.should == 'princely_musings'
+    expect(evt.node).to eq('princely_musings')
   end
 
   it 'ensures newly inherited items are PubSubItem objects' do
     evt = Blather::XMPPNode.parse(event_with_payload_xml)
-    evt.items?.should == true
-    evt.retractions?.should == false
-    evt.items.map { |i| i.class }.uniq.should == [Blather::Stanza::PubSub::PubSubItem]
+    expect(evt.items?).to eq(true)
+    expect(evt.retractions?).to eq(false)
+    expect(evt.items.map { |i| i.class }.uniq).to eq([Blather::Stanza::PubSub::PubSubItem])
   end
 
   it 'will iterate over each item' do
     evt = Blather::XMPPNode.parse(event_with_payload_xml)
-    evt.items.each { |i| i.class.should == Blather::Stanza::PubSub::PubSubItem }
+    evt.items.each { |i| expect(i.class).to eq(Blather::Stanza::PubSub::PubSubItem) }
   end
 
   it 'handles receiving subscription ids' do
     evt = Blather::XMPPNode.parse(event_subids_xml)
-    evt.subscription_ids.should == ['123-abc', '004-yyy']
+    expect(evt.subscription_ids).to eq(['123-abc', '004-yyy'])
   end
 
   it 'can have a list of retractions' do
     evt = Blather::XMPPNode.parse(<<-NODE)
     <message from='pubsub.shakespeare.lit' to='[e-mail]' id='foo'>
@@ -63,36 +63,36 @@
           <retract id='ae890ac52d0df67ed7cfdf51b644e901'/>
         </items>
       </event>
     </message>
     NODE
-    evt.retractions?.should == true
-    evt.items?.should == false
-    evt.retractions.should == %w[ae890ac52d0df67ed7cfdf51b644e901]
+    expect(evt.retractions?).to eq(true)
+    expect(evt.items?).to eq(false)
+    expect(evt.retractions).to eq(%w[ae890ac52d0df67ed7cfdf51b644e901])
   end
 
   it 'can be a purge' do
     evt = Blather::XMPPNode.parse(<<-NODE)
     <message from='pubsub.shakespeare.lit' to='[e-mail]' id='foo'>
       <event xmlns='http://jabber.org/protocol/pubsub#event'>
         <purge node='princely_musings'/>
       </event>
     </message>
     NODE
-    evt.purge?.should_not be_nil
-    evt.node.should == 'princely_musings'
+    expect(evt.purge?).not_to be_nil
+    expect(evt.node).to eq('princely_musings')
   end
 
   it 'can be a subscription notification' do
     evt = Blather::XMPPNode.parse(<<-NODE)
     <message from='pubsub.shakespeare.lit' to='[e-mail]' id='foo'>
       <event xmlns='http://jabber.org/protocol/pubsub#event'>
         <subscription jid='[e-mail]' subscription='subscribed' node='/example.com/test'/>
       </event>
     </message>
     NODE
-    evt.subscription?.should_not be_nil
-    evt.subscription[:jid].should == '[e-mail]'
-    evt.subscription[:subscription].should == 'subscribed'
-    evt.subscription[:node].should == '/example.com/test'
+    expect(evt.subscription?).not_to be_nil
+    expect(evt.subscription[:jid]).to eq('[e-mail]')
+    expect(evt.subscription[:subscription]).to eq('subscribed')
+    expect(evt.subscription[:node]).to eq('/example.com/test')
   end
 end