spec/item.rb in zabbixapi-2.4.7 vs spec/item.rb in zabbixapi-2.4.8

@@ -1,10 +1,10 @@
 #encoding: utf-8
 
 require 'spec_helper'
 
-describe 'application' do
+describe 'item' do
   before :all do
     @hostgroup = gen_name 'hostgroup'
     @hostgroupid = zbx.hostgroups.create(:name => @hostgroup)
     @template = gen_name 'template'
     @templateid = zbx.templates.create(
@@ -30,17 +30,17 @@
           :key_ => "proc.num[#{gen_name 'proc'}]",
           :status => 0,
           :hostid => @templateid,
           :applications => [@applicationid]
         )
-        itemid.should be_kind_of(Integer)
+        expect(itemid).to be_kind_of(Integer)
       end
     end
 
     describe 'get_id' do
       it "should return nil" do
-        expect(zbx.items.get_id(:host => @item)).to be_kind_of(NilClass)
+        expect(zbx.items.get_id(:name => @item)).to be_kind_of(NilClass)
       end
     end
   end
 
   context 'when name exists' do
@@ -77,28 +77,32 @@
       it "should return id of item" do
         expect(zbx.items.get_id(:name => @item)).to eq @itemid
       end
     end
 
+    it "should raise error on no identity given" do
+        expect { zbx.items.get_id({}) }.to raise_error(ZabbixApi::ApiError)
+    end
+
     describe 'update' do
       it "should return id" do
-        zbx.items.update(
+        expect(zbx.items.update(
           :itemid => zbx.items.get_id(:name => @item),
           :status => 1
-        ).should eq @itemid
+        )).to eq @itemid
       end
     end
 
     describe 'create_or_update' do
       it "should update existing item" do
-        zbx.items.create_or_update(
+        expect(zbx.items.create_or_update(
           :name => @item,
           :key_ => "proc.num[#{gen_name 'proc'}]",
           :status => 0,
           :hostid => @templateid,
           :applications => [@applicationid]
-        ).should eq @itemid
+        )).to eq @itemid
       end
 
       it "should create item" do
         new_item_id = zbx.items.create_or_update(
           :name => @item + "____1",
@@ -121,12 +125,10 @@
       it "should return deleted id" do
         expect(@result).to eq @itemid
       end
 
       it "should delete item from zabbix" do
-        expect(zbx.items.get_id(:id => @itemid)).to be_nil
+        expect(zbx.items.get_id(:name => @item)).to be_nil
       end
     end
   end
 end
-
-