blather 1.2.0 → 2.0.0

data/spec/blather/stanza/discos/disco_items_spec.rb

@@ -23,31 +23,31 @@ end
 
 describe Blather::Stanza::Iq::DiscoItems do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:query, 'http://jabber.org/protocol/disco#items').should == Blather::Stanza::Iq::DiscoItems
+    expect(Blather::XMPPNode.class_from_registration(:query, 'http://jabber.org/protocol/disco#items')).to eq(Blather::Stanza::Iq::DiscoItems)
   end
 
   it 'must be importable' do
-    Blather::XMPPNode.parse(disco_items_xml).should be_instance_of Blather::Stanza::Iq::DiscoItems
+    expect(Blather::XMPPNode.parse(disco_items_xml)).to be_instance_of Blather::Stanza::Iq::DiscoItems
   end
 
   it 'is constructed properly' do
     n = Blather::Stanza::Iq::DiscoItems.new :get, '/path/to/node'
     n.to = 'to@jid.com'
-    n.find("/iq[@to='to@jid.com' and @type='get' and @id='#{n.id}']/ns:query[@node='/path/to/node']", :ns => Blather::Stanza::Iq::DiscoItems.registered_ns).should_not be_empty
+    expect(n.find("/iq[@to='to@jid.com' and @type='get' and @id='#{n.id}']/ns:query[@node='/path/to/node']", :ns => Blather::Stanza::Iq::DiscoItems.registered_ns)).not_to be_empty
   end
 
   it 'has a node attribute' do
     n = Blather::Stanza::Iq::DiscoItems.new nil, 'music', []
-    n.node.should == 'music'
+    expect(n.node).to eq('music')
     n.node = :foo
-    n.node.should == 'foo'
+    expect(n.node).to eq('foo')
   end
 
   it 'inherits a list of identities' do
     n = parse_stanza disco_items_xml
     r = Blather::Stanza::Iq::DiscoItems.new.inherit n.root
-    r.items.size.should == 3
-    r.items.map { |i| i.class }.uniq.should == [Blather::Stanza::Iq::DiscoItems::Item]
+    expect(r.items.size).to eq(3)
+    expect(r.items.map { |i| i.class }.uniq).to eq([Blather::Stanza::Iq::DiscoItems::Item])
   end
 
   it 'takes a list of hashes for items' do
@@ -60,8 +60,8 @@ describe Blather::Stanza::Iq::DiscoItems do
                 Blather::Stanza::Iq::DiscoItems::Item.new(*%w[baz@foo/bar node1 name1])]
 
     di = Blather::Stanza::Iq::DiscoItems.new nil, nil, items
-    di.items.size.should == 2
-    di.items.each { |i| control.include?(i).should == true }
+    expect(di.items.size).to eq(2)
+    di.items.each { |i| expect(control.include?(i)).to eq(true) }
   end
 
   it 'takes a list of Item objects as items' do
@@ -69,24 +69,24 @@ describe Blather::Stanza::Iq::DiscoItems do
                 Blather::Stanza::Iq::DiscoItems::Item.new(*%w[baz@foo/bar node1 name1])]
 
     di = Blather::Stanza::Iq::DiscoItems.new nil, nil, control
-    di.items.size.should == 2
-    di.items.each { |i| control.include?(i).should == true }
+    expect(di.items.size).to eq(2)
+    di.items.each { |i| expect(control.include?(i)).to eq(true) }
   end
 
   it 'takes a single hash as identity' do
     control = [Blather::Stanza::Iq::DiscoItems::Item.new(*%w[foo@bar/baz node name])]
 
     di = Blather::Stanza::Iq::DiscoItems.new nil, nil, {:jid => 'foo@bar/baz', :node => 'node', :name => 'name'}
-    di.items.size.should == 1
-    di.items.each { |i| control.include?(i).should == true }
+    expect(di.items.size).to eq(1)
+    di.items.each { |i| expect(control.include?(i)).to eq(true) }
   end
 
   it 'takes a single identity object as identity' do
     control = [Blather::Stanza::Iq::DiscoItems::Item.new(*%w[foo@bar/baz node name])]
 
     di = Blather::Stanza::Iq::DiscoItems.new nil, nil, control.first
-    di.items.size.should == 1
-    di.items.each { |i| control.include?(i).should == true }
+    expect(di.items.size).to eq(1)
+    di.items.each { |i| expect(control.include?(i)).to eq(true) }
   end
 
   it 'takes a mix of hashes and identity objects as items' do
@@ -99,19 +99,19 @@ describe Blather::Stanza::Iq::DiscoItems do
                 Blather::Stanza::Iq::DiscoItems::Item.new(*%w[baz@foo/bar node1 name1])]
 
     di = Blather::Stanza::Iq::DiscoItems.new nil, nil, items
-    di.items.size.should == 2
-    di.items.each { |i| control.include?(i).should == true }
+    expect(di.items.size).to eq(2)
+    di.items.each { |i| expect(control.include?(i)).to eq(true) }
   end
 
   it 'allows adding of items' do
     di = Blather::Stanza::Iq::DiscoItems.new
-    di.items.size.should == 0
+    expect(di.items.size).to eq(0)
     di.items = [{:jid => 'foo@bar/baz', :node => 'node', :name => 'name'}]
-    di.items.size.should == 1
+    expect(di.items.size).to eq(1)
     di.items += [Blather::Stanza::Iq::DiscoItems::Item.new(*%w[foo@bar/baz node name])]
-    di.items.size.should == 2
+    expect(di.items.size).to eq(2)
     di.items = nil
-    di.items.size.should == 0
+    expect(di.items.size).to eq(0)
   end
 end
 
@@ -119,36 +119,36 @@ describe Blather::Stanza::Iq::DiscoItems::Item do
   it 'will auto-inherit nodes' do
     n = parse_stanza "<item jid='foo@bar/baz' node='music' name='Music from the time of Shakespeare' />"
     i = Blather::Stanza::Iq::DiscoItems::Item.new n.root
-    i.jid.should == Blather::JID.new('foo@bar/baz')
-    i.node.should == 'music'
-    i.name.should == 'Music from the time of Shakespeare'
+    expect(i.jid).to eq(Blather::JID.new('foo@bar/baz'))
+    expect(i.node).to eq('music')
+    expect(i.name).to eq('Music from the time of Shakespeare')
   end
 
   it 'has a jid attribute' do
     n = Blather::Stanza::Iq::DiscoItems::Item.new 'foo@bar/baz'
-    n.jid.should be_kind_of Blather::JID
-    n.jid.should == Blather::JID.new('foo@bar/baz')
+    expect(n.jid).to be_kind_of Blather::JID
+    expect(n.jid).to eq(Blather::JID.new('foo@bar/baz'))
     n.jid = 'baz@foo/bar'
-    n.jid.should == Blather::JID.new('baz@foo/bar')
+    expect(n.jid).to eq(Blather::JID.new('baz@foo/bar'))
   end
 
   it 'has a node attribute' do
     n = Blather::Stanza::Iq::DiscoItems::Item.new 'foo@bar/baz', 'music'
-    n.node.should == 'music'
+    expect(n.node).to eq('music')
     n.node = 'book'
-    n.node.should == 'book'
+    expect(n.node).to eq('book')
   end
 
   it 'has a name attribute' do
     n = Blather::Stanza::Iq::DiscoItems::Item.new 'foo@bar/baz', nil, 'Music from the time of Shakespeare'
-    n.name.should == 'Music from the time of Shakespeare'
+    expect(n.name).to eq('Music from the time of Shakespeare')
     n.name = 'Books by and about Shakespeare'
-    n.name.should == 'Books by and about Shakespeare'
+    expect(n.name).to eq('Books by and about Shakespeare')
   end
 
   it 'can determine equality' do
     a = Blather::Stanza::Iq::DiscoItems::Item.new('foo@bar/baz')
-    a.should == Blather::Stanza::Iq::DiscoItems::Item.new('foo@bar/baz')
-    a.should_not equal Blather::Stanza::Iq::DiscoItems::Item.new('not-foo@bar/baz')
+    expect(a).to eq(Blather::Stanza::Iq::DiscoItems::Item.new('foo@bar/baz'))
+    expect(a).not_to equal Blather::Stanza::Iq::DiscoItems::Item.new('not-foo@bar/baz')
   end
 end

data/spec/blather/stanza/iq/command_spec.rb

@@ -19,188 +19,188 @@ end
 
 describe Blather::Stanza::Iq::Command do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:command, 'http://jabber.org/protocol/commands').should == Blather::Stanza::Iq::Command
+    expect(Blather::XMPPNode.class_from_registration(:command, 'http://jabber.org/protocol/commands')).to eq(Blather::Stanza::Iq::Command)
   end
 
   it 'must be importable' do
-    Blather::XMPPNode.parse(command_xml).should be_instance_of Blather::Stanza::Iq::Command
+    expect(Blather::XMPPNode.parse(command_xml)).to be_instance_of Blather::Stanza::Iq::Command
   end
 
   it 'ensures a command node is present on create' do
     c = Blather::Stanza::Iq::Command.new
-    c.xpath('xmlns:command', :xmlns => Blather::Stanza::Iq::Command.registered_ns).should_not be_empty
+    expect(c.xpath('xmlns:command', :xmlns => Blather::Stanza::Iq::Command.registered_ns)).not_to be_empty
   end
 
   it 'ensures a command node exists when calling #command' do
     c = Blather::Stanza::Iq::Command.new
     c.remove_children :command
-    c.xpath('ns:command', :ns => Blather::Stanza::Iq::Command.registered_ns).should be_empty
+    expect(c.xpath('ns:command', :ns => Blather::Stanza::Iq::Command.registered_ns)).to be_empty
 
-    c.command.should_not be_nil
-    c.xpath('ns:command', :ns => Blather::Stanza::Iq::Command.registered_ns).should_not be_empty
+    expect(c.command).not_to be_nil
+    expect(c.xpath('ns:command', :ns => Blather::Stanza::Iq::Command.registered_ns)).not_to be_empty
   end
 
   Blather::Stanza::Iq::Command::VALID_ACTIONS.each do |valid_action|
     it "provides a helper (#{valid_action}?) for action #{valid_action}" do
-      Blather::Stanza::Iq::Command.new.should respond_to :"#{valid_action}?"
+      expect(Blather::Stanza::Iq::Command.new).to respond_to :"#{valid_action}?"
     end
   end
 
   Blather::Stanza::Iq::Command::VALID_STATUS.each do |valid_status|
     it "provides a helper (#{valid_status}?) for status #{valid_status}" do
-      Blather::Stanza::Iq::Command.new.should respond_to :"#{valid_status}?"
+      expect(Blather::Stanza::Iq::Command.new).to respond_to :"#{valid_status}?"
     end
   end
 
   Blather::Stanza::Iq::Command::VALID_NOTE_TYPES.each do |valid_note_type|
     it "provides a helper (#{valid_note_type}?) for note_type #{valid_note_type}" do
-      Blather::Stanza::Iq::Command.new.should respond_to :"#{valid_note_type}?"
+      expect(Blather::Stanza::Iq::Command.new).to respond_to :"#{valid_note_type}?"
     end
   end
 
   [:cancel, :execute, :complete, :next, :prev].each do |action|
     it "action can be set as \"#{action}\"" do
       c = Blather::Stanza::Iq::Command.new nil, nil, action
-      c.action.should == action
+      expect(c.action).to eq(action)
     end
   end
 
   [:get, :set, :result, :error].each do |type|
     it "can be set as \"#{type}\"" do
       c = Blather::Stanza::Iq::Command.new type
-      c.type.should == type
+      expect(c.type).to eq(type)
     end
   end
 
   it 'sets type to "result" on reply' do
     c = Blather::Stanza::Iq::Command.new
-    c.type.should == :set
-    reply = c.reply.type.should == :result
+    expect(c.type).to eq(:set)
+    reply = expect(c.reply.type).to eq(:result)
   end
 
   it 'sets type to "result" on reply!' do
     c = Blather::Stanza::Iq::Command.new
-    c.type.should == :set
+    expect(c.type).to eq(:set)
     c.reply!
-    c.type.should == :result
+    expect(c.type).to eq(:result)
   end
 
   it 'removes action on reply' do
     c = Blather::XMPPNode.parse command_xml
-    c.action.should == :execute
-    c.reply.action.should == nil
+    expect(c.action).to eq(:execute)
+    expect(c.reply.action).to eq(nil)
   end
 
   it 'removes action on reply!' do
     c = Blather::XMPPNode.parse command_xml
-    c.action.should == :execute
+    expect(c.action).to eq(:execute)
     c.reply!
-    c.action.should == nil
+    expect(c.action).to eq(nil)
   end
 
   it 'can be registered under a namespace' do
     class CommandNs < Blather::Stanza::Iq::Command; register :command_ns, nil, 'command:ns'; end
-    Blather::XMPPNode.class_from_registration(:command, 'command:ns').should == CommandNs
+    expect(Blather::XMPPNode.class_from_registration(:command, 'command:ns')).to eq(CommandNs)
     c_ns = CommandNs.new
-    c_ns.xpath('command').should be_empty
-    c_ns.xpath('ns:command', :ns => 'command:ns').size.should == 1
+    expect(c_ns.xpath('command')).to be_empty
+    expect(c_ns.xpath('ns:command', :ns => 'command:ns').size).to eq(1)
 
     c_ns.command
     c_ns.command
-    c_ns.xpath('ns:command', :ns => 'command:ns').size.should == 1
+    expect(c_ns.xpath('ns:command', :ns => 'command:ns').size).to eq(1)
   end
 
   it 'is constructed properly' do
     n = Blather::Stanza::Iq::Command.new :set, "node", :execute
     n.to = 'to@jid.com'
-    n.find("/iq[@to='to@jid.com' and @type='set' and @id='#{n.id}']/ns:command[@node='node' and @action='execute']", :ns => Blather::Stanza::Iq::Command.registered_ns).should_not be_empty
+    expect(n.find("/iq[@to='to@jid.com' and @type='set' and @id='#{n.id}']/ns:command[@node='node' and @action='execute']", :ns => Blather::Stanza::Iq::Command.registered_ns)).not_to be_empty
   end
 
   it 'has an action attribute' do
     n = Blather::Stanza::Iq::Command.new
-    n.action.should == :execute
+    expect(n.action).to eq(:execute)
     n.action = :cancel
-    n.action.should == :cancel
+    expect(n.action).to eq(:cancel)
   end
 
   it 'must default action to :execute on import' do
     n = Blather::XMPPNode.parse(command_xml)
-    n.action.should == :execute
+    expect(n.action).to eq(:execute)
   end
 
   it 'has a status attribute' do
     n = Blather::Stanza::Iq::Command.new
-    n.status.should == :executing
+    expect(n.status).to eq(:executing)
     n.status = :completed
-    n.status.should == :completed
+    expect(n.status).to eq(:completed)
   end
 
   it 'has a sessionid attribute' do
     n = Blather::Stanza::Iq::Command.new
-    n.sessionid.should == nil
+    expect(n.sessionid).to eq(nil)
     n.sessionid = "somerandomstring"
-    n.sessionid.should == Digest::SHA1.hexdigest("somerandomstring")
+    expect(n.sessionid).to eq(Digest::SHA1.hexdigest("somerandomstring"))
   end
 
   it 'has a sessionid? attribute' do
     n = Blather::Stanza::Iq::Command.new
-    n.sessionid?.should == false
+    expect(n.sessionid?).to eq(false)
     n.new_sessionid!
-    n.sessionid?.should == true
+    expect(n.sessionid?).to eq(true)
   end
 
   it 'has an allowed_actions attribute' do
     n = Blather::XMPPNode.parse command_xml
-    n.allowed_actions.should == [:execute]
+    expect(n.allowed_actions).to eq([:execute])
     n.allowed_actions = [:next, :prev]
-    (n.allowed_actions - [:next, :prev, :execute]).should be_empty
+    expect(n.allowed_actions - [:next, :prev, :execute]).to be_empty
     n.remove_allowed_actions!
-    n.allowed_actions.should == [:execute]
+    expect(n.allowed_actions).to eq([:execute])
     n.allowed_actions += [:next]
-    (n.allowed_actions - [:next, :execute]).should be_empty
+    expect(n.allowed_actions - [:next, :execute]).to be_empty
 
     r = Blather::Stanza::Iq::Command.new
-    r.allowed_actions.should == [:execute]
+    expect(r.allowed_actions).to eq([:execute])
     r.allowed_actions += [:prev]
-    (r.allowed_actions - [:prev, :execute]).should be_empty
+    expect(r.allowed_actions - [:prev, :execute]).to be_empty
   end
 
   it 'has a primary_allowed_action attribute' do
     n = Blather::XMPPNode.parse command_xml
-    n.primary_allowed_action.should == :execute
+    expect(n.primary_allowed_action).to eq(:execute)
     n.primary_allowed_action = :next
-    n.primary_allowed_action.should == :next
+    expect(n.primary_allowed_action).to eq(:next)
   end
 
   it 'has a note_type attribute' do
     n = Blather::Stanza::Iq::Command.new
-    n.note_type.should == nil
+    expect(n.note_type).to eq(nil)
     n.note_type = :info
-    n.note_type.should == :info
+    expect(n.note_type).to eq(:info)
   end
 
   it 'has a note_text attribute' do
     n = Blather::Stanza::Iq::Command.new
-    n.note_text.should == nil
+    expect(n.note_text).to eq(nil)
     n.note_text = "Some text"
-    n.note_text.should == "Some text"
+    expect(n.note_text).to eq("Some text")
   end
 
   it 'makes a form child available' do
     n = Blather::XMPPNode.parse(command_xml)
-    n.form.fields.size.should == 1
-    n.form.fields.map { |f| f.class }.uniq.should == [Blather::Stanza::X::Field]
-    n.form.should be_instance_of Blather::Stanza::X
+    expect(n.form.fields.size).to eq(1)
+    expect(n.form.fields.map { |f| f.class }.uniq).to eq([Blather::Stanza::X::Field])
+    expect(n.form).to be_instance_of Blather::Stanza::X
 
     r = Blather::Stanza::Iq::Command.new
     r.form.type = :form
-    r.form.type.should == :form
+    expect(r.form.type).to eq(:form)
   end
 
   it 'ensures the form child is a child of command' do
     r = Blather::Stanza::Iq::Command.new
     r.form
-    r.command.xpath('ns:x', :ns => Blather::Stanza::X.registered_ns).should_not be_empty
-    r.xpath('ns:x', :ns => Blather::Stanza::X.registered_ns).should be_empty
+    expect(r.command.xpath('ns:x', :ns => Blather::Stanza::X.registered_ns)).not_to be_empty
+    expect(r.xpath('ns:x', :ns => Blather::Stanza::X.registered_ns)).to be_empty
   end
 end

data/spec/blather/stanza/iq/ibb_spec.rb

@@ -44,81 +44,81 @@ end
 
 describe Blather::Stanza::Iq::Ibb::Open do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:open, 'http://jabber.org/protocol/ibb').should == Blather::Stanza::Iq::Ibb::Open
+    expect(Blather::XMPPNode.class_from_registration(:open, 'http://jabber.org/protocol/ibb')).to eq(Blather::Stanza::Iq::Ibb::Open)
   end
 
   it 'can be imported' do
     node = Blather::XMPPNode.parse ibb_open_xml
-    node.should be_instance_of Blather::Stanza::Iq::Ibb::Open
+    expect(node).to be_instance_of Blather::Stanza::Iq::Ibb::Open
   end
 
   it 'has open node' do
     node = Blather::XMPPNode.parse ibb_open_xml
-    node.open.should be_kind_of Nokogiri::XML::Element
+    expect(node.open).to be_kind_of Nokogiri::XML::Element
   end
 
   it 'can get sid' do
     node = Blather::XMPPNode.parse ibb_open_xml
-    node.sid.should == 'i781hf64'
+    expect(node.sid).to eq('i781hf64')
   end
 
   it 'deleted open node on reply' do
     node = Blather::XMPPNode.parse ibb_open_xml
     reply = node.reply
-    reply.open.should be_nil
+    expect(reply.open).to be_nil
   end
 end
 
 describe Blather::Stanza::Iq::Ibb::Data do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:data, 'http://jabber.org/protocol/ibb').should == Blather::Stanza::Iq::Ibb::Data
+    expect(Blather::XMPPNode.class_from_registration(:data, 'http://jabber.org/protocol/ibb')).to eq(Blather::Stanza::Iq::Ibb::Data)
   end
 
   it 'can be imported' do
     node = Blather::XMPPNode.parse ibb_data_xml
-    node.should be_instance_of Blather::Stanza::Iq::Ibb::Data
+    expect(node).to be_instance_of Blather::Stanza::Iq::Ibb::Data
   end
 
   it 'has data node' do
     node = Blather::XMPPNode.parse ibb_data_xml
-    node.data.should be_kind_of Nokogiri::XML::Element
+    expect(node.data).to be_kind_of Nokogiri::XML::Element
   end
 
   it 'can get sid' do
     node = Blather::XMPPNode.parse ibb_data_xml
-    node.sid.should == 'i781hf64'
+    expect(node.sid).to eq('i781hf64')
   end
 
   it 'deleted data node on reply' do
     node = Blather::XMPPNode.parse ibb_data_xml
     reply = node.reply
-    reply.data.should be_nil
+    expect(reply.data).to be_nil
   end
 end
 
 describe Blather::Stanza::Iq::Ibb::Close do
   it 'registers itself' do
-    Blather::XMPPNode.class_from_registration(:close, 'http://jabber.org/protocol/ibb').should == Blather::Stanza::Iq::Ibb::Close
+    expect(Blather::XMPPNode.class_from_registration(:close, 'http://jabber.org/protocol/ibb')).to eq(Blather::Stanza::Iq::Ibb::Close)
   end
 
   it 'can be imported' do
     node = Blather::XMPPNode.parse ibb_close_xml
-    node.should be_instance_of Blather::Stanza::Iq::Ibb::Close
+    expect(node).to be_instance_of Blather::Stanza::Iq::Ibb::Close
   end
 
   it 'has close node' do
     node = Blather::XMPPNode.parse ibb_close_xml
-    node.close.should be_kind_of Nokogiri::XML::Element
+    expect(node.close).to be_kind_of Nokogiri::XML::Element
   end
 
   it 'can get sid' do
     node = Blather::XMPPNode.parse ibb_close_xml
-    node.sid.should == 'i781hf64'
+    expect(node.sid).to eq('i781hf64')
   end
 
   it 'deleted close node on reply' do
     node = Blather::XMPPNode.parse ibb_close_xml
     reply = node.reply
-    reply.close.should be_nil
+    expect(reply.close).to be_nil
   end
 end