neography 1.5.0 → 1.5.1

data/spec/integration/rest_batch_streaming_spec.rb

@@ -13,8 +13,8 @@ describe Neography::Rest do
         commands << [:create_node, {"name" => "Max " + x.to_s}]
       end
       batch_result = @neo.batch *commands
-      batch_result.first["body"]["data"]["name"].should == "Max 0"
-      batch_result.last["body"]["data"]["name"].should == "Max 999"
+      expect(batch_result.first["body"]["data"]["name"]).to eq("Max 0")
+      expect(batch_result.last["body"]["data"]["name"]).to eq("Max 999")
     end
 
     it "can send a 5000 item batch" do
@@ -23,8 +23,8 @@ describe Neography::Rest do
         commands << [:get_node, 0]
       end
       batch_result = @neo.batch *commands
-      batch_result.first["body"]["self"].split('/').last.should == "0"
-      batch_result.last["body"]["self"].split('/').last.should == "0"
+      expect(batch_result.first["body"]["self"].split('/').last).to eq("0")
+      expect(batch_result.last["body"]["self"].split('/').last).to eq("0")
     end
 
     it "can send a 7000 get item batch" do
@@ -33,8 +33,8 @@ describe Neography::Rest do
         commands << [:get_node, 0]
       end
       batch_result = @neo.batch *commands
-      batch_result.first["body"]["self"].split('/').last.should == "0"
-      batch_result.last["body"]["self"].split('/').last.should == "0"
+      expect(batch_result.first["body"]["self"].split('/').last).to eq("0")
+      expect(batch_result.last["body"]["self"].split('/').last).to eq("0")
     end
 
     it "can send a 5000 create item batch" do
@@ -43,8 +43,8 @@ describe Neography::Rest do
         commands << [:create_node, {"name" => "Max " + x.to_s}]
       end
       batch_result = @neo.batch *commands
-      batch_result.first["body"]["data"]["name"].should == "Max 0"
-      batch_result.last["body"]["data"]["name"].should == "Max 4999"
+      expect(batch_result.first["body"]["data"]["name"]).to eq("Max 0")
+      expect(batch_result.last["body"]["data"]["name"]).to eq("Max 4999")
     end
 
   end

data/spec/integration/rest_bulk_spec.rb

@@ -8,8 +8,8 @@ describe Neography::Rest do
   describe "can create many nodes threaded" do
     it "can create empty nodes threaded" do
       new_nodes = @neo.create_nodes_threaded(2)
-      new_nodes.should_not be_nil
-      new_nodes.size.should == 2
+      expect(new_nodes).not_to be_nil
+      expect(new_nodes.size).to eq(2)
     end
 
     it "is faster than non-threaded?" , :slow => true do
@@ -19,9 +19,9 @@ describe Neography::Rest do
         x.report("create 1000 nodes threaded") { @threaded2c   = @neo.create_nodes_threaded(1000) }
       end
 
-      @not_threaded[99].should_not be_nil
-      @threaded[99].should_not be_nil
-      @threaded2c[199].should_not be_nil
+      expect(@not_threaded[99]).not_to be_nil
+      expect(@threaded[99]).not_to be_nil
+      expect(@threaded2c[199]).not_to be_nil
     end
 
   end
@@ -29,36 +29,36 @@ describe Neography::Rest do
   describe "can create many nodes" do
     it "can create empty nodes" do
       new_nodes = @neo.create_nodes(2)
-      new_nodes.should_not be_nil
-      new_nodes.size.should == 2
+      expect(new_nodes).not_to be_nil
+      expect(new_nodes.size).to eq(2)
     end
 
     it "can create nodes with one property" do
       new_nodes = @neo.create_nodes([{"name" => "Max"}, {"name" => "Alex"}])
-      new_nodes[0]["data"]["name"].should == "Max"
-      new_nodes[1]["data"]["name"].should == "Alex"
+      expect(new_nodes[0]["data"]["name"]).to eq("Max")
+      expect(new_nodes[1]["data"]["name"]).to eq("Alex")
     end
 
     it "can create nodes with one property that are different" do
       new_nodes = @neo.create_nodes([{"name" => "Max"}, {"age" => 24}])
-      new_nodes[0]["data"]["name"].should == "Max"
-      new_nodes[1]["data"]["age"].should == 24
+      expect(new_nodes[0]["data"]["name"]).to eq("Max")
+      expect(new_nodes[1]["data"]["age"]).to eq(24)
     end
 
     it "can create nodes with more than one property" do
       new_nodes = @neo.create_nodes([{"age" => 31, "name" => "Max"}, {"age" => 24, "name" => "Alex"}])
-      new_nodes[0]["data"]["name"].should == "Max"
-      new_nodes[0]["data"]["age"].should == 31
-      new_nodes[1]["data"]["name"].should == "Alex"
-      new_nodes[1]["data"]["age"].should == 24
+      expect(new_nodes[0]["data"]["name"]).to eq("Max")
+      expect(new_nodes[0]["data"]["age"]).to eq(31)
+      expect(new_nodes[1]["data"]["name"]).to eq("Alex")
+      expect(new_nodes[1]["data"]["age"]).to eq(24)
     end
 
     it "can create nodes with more than one property that are different" do
       new_nodes = @neo.create_nodes([{"age" => 31, "name" => "Max"}, {"height" => "5-11", "weight" => 215}])
-      new_nodes[0]["data"]["name"].should == "Max"
-      new_nodes[0]["data"]["age"].should == 31
-      new_nodes[1]["data"]["height"].should == "5-11"
-      new_nodes[1]["data"]["weight"].should == 215
+      expect(new_nodes[0]["data"]["name"]).to eq("Max")
+      expect(new_nodes[0]["data"]["age"]).to eq(31)
+      expect(new_nodes[1]["data"]["height"]).to eq("5-11")
+      expect(new_nodes[1]["data"]["weight"]).to eq(215)
     end
 
     it "is not super slow?" , :slow => true do
@@ -74,8 +74,8 @@ describe Neography::Rest do
     it "can get 2 nodes passed in as an array" do
       new_nodes = @neo.create_nodes(2)
       existing_nodes = @neo.get_nodes(new_nodes)
-      existing_nodes.should_not be_nil
-      existing_nodes.size.should == 2
+      expect(existing_nodes).not_to be_nil
+      expect(existing_nodes.size).to eq(2)
     end
 
     it "can get 2 nodes passed in by commas" do
@@ -83,8 +83,8 @@ describe Neography::Rest do
       new_node1 = new_nodes[0]["self"].split('/').last
       new_node2 = new_nodes[1]["self"].split('/').last
       existing_nodes = @neo.get_nodes(new_node1, new_node2)
-      existing_nodes.should_not be_nil
-      existing_nodes.size.should == 2
+      expect(existing_nodes).not_to be_nil
+      expect(existing_nodes.size).to eq(2)
       existing_nodes[0]["self"] == new_node1["self"]
       existing_nodes[1]["self"] == new_node2["self"]
     end

data/spec/integration/rest_constraints_spec.rb

@@ -10,9 +10,9 @@ describe Neography::Rest do
       label = "User"
       property = "user_id"
       uc = @neo.create_unique_constraint(label, property)
-      uc.should_not be_nil
-      uc["label"].should == label
-      uc["property_keys"].should == [property]
+      expect(uc).not_to be_nil
+      expect(uc["label"]).to eq(label)
+      expect(uc["property_keys"]).to eq([property])
     end
   end
 
@@ -21,9 +21,9 @@ describe Neography::Rest do
       label = "User"
       property = "user_id"
       uc = @neo.get_unique_constraint(label, property)
-      uc.should_not be_nil
-      uc.first["label"].should == label
-      uc.first["property_keys"].should == [property]
+      expect(uc).not_to be_nil
+      expect(uc.first["label"]).to eq(label)
+      expect(uc.first["property_keys"]).to eq([property])
     end
   end
 
@@ -32,9 +32,9 @@ describe Neography::Rest do
       label = "User"
       property = "user_id"
       uc = @neo.get_uniqueness(label)
-      uc.should_not be_nil
-      uc.first["label"].should == label
-      uc.first["property_keys"].should == [property]
+      expect(uc).not_to be_nil
+      expect(uc.first["label"]).to eq(label)
+      expect(uc.first["property_keys"]).to eq([property])
     end
   end
   
@@ -43,18 +43,18 @@ describe Neography::Rest do
       label = "User"
       property = "user_id"
       cs = @neo.get_constraints
-      cs.should_not be_nil
-      cs.first["label"].should == label
-      cs.first["property_keys"].should == [property]
+      expect(cs).not_to be_nil
+      expect(cs.first["label"]).to eq(label)
+      expect(cs.first["property_keys"]).to eq([property])
     end
 
     it "can get a list of constraints for a specifc label" do
       label = "User"
       property = "user_id"
       cs = @neo.get_constraints(label)
-      cs.should_not be_nil
-      cs.first["label"].should == label
-      cs.first["property_keys"].should == [property]
+      expect(cs).not_to be_nil
+      expect(cs.first["label"]).to eq(label)
+      expect(cs.first["property_keys"]).to eq([property])
     end
   end
   
@@ -63,9 +63,9 @@ describe Neography::Rest do
       label = "User"
       property = "user_id"
       uc = @neo.drop_constraint(label, property)
-      uc.should be_nil
+      expect(uc).to be_nil
       cs = @neo.get_constraints(label)
-      cs.should be_empty
+      expect(cs).to be_empty
     end
   end
     

data/spec/integration/rest_experimental_spec.rb

@@ -9,14 +9,14 @@ describe Neography::Rest do
   describe "get_nodes", :slow => true do
     it "can get nodes that exists" do
       existing_nodes = @neo.get_nodes
-      existing_nodes.should_not be_nil
+      expect(existing_nodes).not_to be_nil
     end
 
     it "can get all nodes that exists the ugly way" do
       new_node = @neo.create_node
       last_node_id = new_node["self"].split('/').last.to_i
       existing_nodes = @neo.get_nodes((1..last_node_id).to_a)
-      existing_nodes.should_not be_nil
+      expect(existing_nodes).not_to be_nil
     end
   end
 end

data/spec/integration/rest_gremlin_fail_spec.rb

@@ -18,8 +18,8 @@ describe Neography::Rest do
 
     it "gremlin works", :gremlin => true  do
       root_node = @neo.execute_script("g.v(0)")
-      root_node.should have_key("self")
-      root_node["self"].split('/').last.should == "0"
+      expect(root_node).to have_key("self")
+      expect(root_node["self"].split('/').last).to eq("0")
     end
   end
 
@@ -37,8 +37,8 @@ describe Neography::Rest do
 
     it "gremlin works", :gremlin => true  do
       root_node = @neo.execute_script("g.v(0)")
-      root_node.should have_key("self")
-      root_node["self"].split('/').last.should == "0"
+      expect(root_node).to have_key("self")
+      expect(root_node["self"].split('/').last).to eq("0")
     end
   end
 

data/spec/integration/rest_header_spec.rb

@@ -3,12 +3,13 @@ require 'spec_helper'
 describe Neography::Connection do
 
   it "should not add a content-type header if there's no existing headers" do
-    subject.merge_options({}).keys.should == []
+    expect(subject.merge_options({}).keys).to eq([])
   end
 
   it "should add a content type if there's existing headers" do
-    subject.merge_options({:headers => {'Content-Type' => 'foo/bar'}})[:headers].should ==
+    expect(subject.merge_options({:headers => {'Content-Type' => 'foo/bar'}})[:headers]).to eq(
       {'Content-Type' => "foo/bar",  "User-Agent"   => "Neography/#{Neography::VERSION}" , "X-Stream"=>true, "max-execution-time"=>6000}
+    )
   end
 
 end

data/spec/integration/rest_index_spec.rb

@@ -11,7 +11,7 @@ describe Neography::Rest do
       key = generate_text(6)
       value = generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node) 
-      @neo.list_indexes.should_not be_nil
+      expect(@neo.list_indexes).not_to be_nil
     end
 
     it "can get a listing of relationship indexes" do
@@ -21,7 +21,7 @@ describe Neography::Rest do
       key = generate_text(6)
       value = generate_text
       @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
-      @neo.list_relationship_indexes.should_not be_nil
+      expect(@neo.list_relationship_indexes).not_to be_nil
     end
   end
 
@@ -29,47 +29,47 @@ describe Neography::Rest do
     it "can create a node index" do
       name = generate_text(6)
       new_index = @neo.create_node_index(name)
-      new_index.should_not be_nil
-      new_index["template"].should == "#{@neo.configuration}/db/data/index/node/#{name}/{key}/{value}"
-      new_index["provider"].should == "lucene"
-      new_index["type"].should == "exact"
+      expect(new_index).not_to be_nil
+      expect(new_index["template"]).to eq("#{@neo.configuration}/db/data/index/node/#{name}/{key}/{value}")
+      expect(new_index["provider"]).to eq("lucene")
+      expect(new_index["type"]).to eq("exact")
     end
 
     it "can create a node index with options" do
       name = generate_text(6)
       new_index = @neo.create_node_index(name, "fulltext","lucene")
-      new_index.should_not be_nil
-      new_index["template"].should == "#{@neo.configuration}/db/data/index/node/#{name}/{key}/{value}"
-      new_index["provider"].should == "lucene"
-      new_index["type"].should == "fulltext"
+      expect(new_index).not_to be_nil
+      expect(new_index["template"]).to eq("#{@neo.configuration}/db/data/index/node/#{name}/{key}/{value}")
+      expect(new_index["provider"]).to eq("lucene")
+      expect(new_index["type"]).to eq("fulltext")
     end
 
     it "can create a node index with extra configuration options" do
       name = generate_text(6)
       new_index = @neo.create_node_index(name, "fulltext","lucene", extra: 'extra-value')
-      new_index.should_not be_nil
-      new_index["template"].should == "#{@neo.configuration}/db/data/index/node/#{name}/{key}/{value}"
-      new_index["provider"].should == "lucene"
-      new_index["extra"].should == "extra-value"
-      new_index["type"].should == "fulltext"
+      expect(new_index).not_to be_nil
+      expect(new_index["template"]).to eq("#{@neo.configuration}/db/data/index/node/#{name}/{key}/{value}")
+      expect(new_index["provider"]).to eq("lucene")
+      expect(new_index["extra"]).to eq("extra-value")
+      expect(new_index["type"]).to eq("fulltext")
     end
 
     it "can create a relationship index" do
       name = generate_text(6)
       new_index = @neo.create_relationship_index(name)
-      new_index.should_not be_nil
-      new_index["template"].should == "#{@neo.configuration}/db/data/index/relationship/#{name}/{key}/{value}"
-      new_index["provider"].should == "lucene"
-      new_index["type"].should == "exact"
+      expect(new_index).not_to be_nil
+      expect(new_index["template"]).to eq("#{@neo.configuration}/db/data/index/relationship/#{name}/{key}/{value}")
+      expect(new_index["provider"]).to eq("lucene")
+      expect(new_index["type"]).to eq("exact")
     end
 
     it "can create a relationship index with options" do
       name = generate_text(6)
       new_index = @neo.create_relationship_index(name, "fulltext","lucene")
-      new_index.should_not be_nil
-      new_index["template"].should == "#{@neo.configuration}/db/data/index/relationship/#{name}/{key}/{value}"
-      new_index["provider"].should == "lucene"
-      new_index["type"].should == "fulltext"
+      expect(new_index).not_to be_nil
+      expect(new_index["template"]).to eq("#{@neo.configuration}/db/data/index/relationship/#{name}/{key}/{value}")
+      expect(new_index["provider"]).to eq("lucene")
+      expect(new_index["type"]).to eq("fulltext")
     end
 
 
@@ -82,7 +82,7 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node) 
       new_index = @neo.get_node_index("test_node_index", key, value) 
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.remove_node_from_index("test_node_index", key, value, new_node) 
     end
   
@@ -94,7 +94,7 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
       new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship) 
     end
   end
@@ -106,10 +106,10 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node) 
       new_index = @neo.get_node_index("test_node_index", key, value) 
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.remove_node_from_index("test_node_index", key, value, new_node) 
       new_index = @neo.get_node_index("test_node_index", key, value) 
-      new_index.should be_nil
+      expect(new_index).to be_nil
     end
 
     it "can remove a node from an index without supplying value" do
@@ -118,10 +118,10 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node) 
       new_index = @neo.get_node_index("test_node_index", key, value) 
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.remove_node_from_index("test_node_index", key, new_node) 
       new_index = @neo.get_node_index("test_node_index", key, value) 
-      new_index.should be_nil
+      expect(new_index).to be_nil
     end
 
     it "can remove a node from an index without supplying key nor value" do
@@ -130,10 +130,10 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node) 
       new_index = @neo.get_node_index("test_node_index", key, value) 
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.remove_node_from_index("test_node_index", new_node) 
       new_index = @neo.get_node_index("test_node_index", key, value) 
-      new_index.should be_nil
+      expect(new_index).to be_nil
     end
 
     it "can remove a relationship from an index" do
@@ -144,10 +144,10 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
       new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship) 
       new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
-      new_index.should be_nil
+      expect(new_index).to be_nil
     end
 
     it "can remove a relationship from an index without supplying value" do
@@ -158,10 +158,10 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
       new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.remove_relationship_from_index("test_relationship_index", key, new_relationship) 
       new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
-      new_index.should be_nil
+      expect(new_index).to be_nil
     end
 
     it "can remove a relationship from an index without supplying key nor value" do
@@ -172,10 +172,10 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
       new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.remove_relationship_from_index("test_relationship_index", new_relationship) 
       new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
-      new_index.should be_nil
+      expect(new_index).to be_nil
     end
 
     it "throws an error when there is an empty string in the value when removing a node" do
@@ -184,7 +184,7 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node) 
       new_index = @neo.get_node_index("test_node_index", key, value) 
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       expect { @neo.remove_node_from_index("test_node_index", key, "", new_node) }.to raise_error Neography::NeographyError
     end
   end
@@ -196,7 +196,7 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node) 
       new_index = @neo.get_node_index("test_node_index", key, value) 
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.remove_node_from_index("test_node_index", key, value, new_node) 
     end
 
@@ -206,7 +206,7 @@ describe Neography::Rest do
       value = generate_text + " " + generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node)
       new_index = @neo.get_node_index("test_node_index", key, value)
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.remove_node_from_index("test_node_index", key, value, new_node)
     end
 
@@ -216,7 +216,7 @@ describe Neography::Rest do
       value = generate_text + "/" + generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node)
       new_index = @neo.get_node_index("test_node_index", key, value)
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.remove_node_from_index("test_node_index", key, value, new_node)
     end
 
@@ -228,7 +228,7 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
       new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship)
     end
   end
@@ -240,7 +240,7 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node) 
       new_index = @neo.get_node_index("test_node_index", key, value) 
-      new_index.first["self"].should == new_node["self"]
+      expect(new_index.first["self"]).to eq(new_node["self"])
       @neo.remove_node_from_index("test_node_index", key, value, new_node) 
     end
 
@@ -250,7 +250,7 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node) 
       new_index = @neo.find_node_index("test_node_index", key, value) 
-      new_index.first["self"].should == new_node["self"]
+      expect(new_index.first["self"]).to eq(new_node["self"])
       @neo.remove_node_from_index("test_node_index", key, value, new_node) 
     end
 
@@ -260,7 +260,7 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node)
       new_index = @neo.find_node_index("test_node_index", "#{key}: #{value}")
-      new_index.first["self"].should == new_node["self"]
+      expect(new_index.first["self"]).to eq(new_node["self"])
       @neo.remove_node_from_index("test_node_index", key, value, new_node)
     end
 
@@ -270,8 +270,8 @@ describe Neography::Rest do
       value = generate_text + ' ' + generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node)
       new_index = @neo.find_node_index("test_node_index", key, value)
-      new_index.should_not be_nil
-      new_index.first["self"].should == new_node["self"]
+      expect(new_index).not_to be_nil
+      expect(new_index.first["self"]).to eq(new_node["self"])
       @neo.remove_node_from_index("test_node_index", key, value, new_node)
     end
 
@@ -281,8 +281,8 @@ describe Neography::Rest do
       value = generate_text + '/' + generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node)
       new_index = @neo.find_node_index("test_node_index", key, value)
-      new_index.should_not be_nil
-      new_index.first["self"].should == new_node["self"]
+      expect(new_index).not_to be_nil
+      expect(new_index.first["self"]).to eq(new_node["self"])
       @neo.remove_node_from_index("test_node_index", key, value, new_node)
     end
 
@@ -294,7 +294,7 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
       new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
-      new_index.first["self"].should == new_relationship["self"]
+      expect(new_index.first["self"]).to eq(new_relationship["self"])
       @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship)
     end
 
@@ -306,7 +306,7 @@ describe Neography::Rest do
       value = generate_text + " " + generate_text
       @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
       new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
-      new_index.first["self"].should == new_relationship["self"]
+      expect(new_index.first["self"]).to eq(new_relationship["self"])
       @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship)
     end
 
@@ -318,7 +318,7 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
       new_index = @neo.find_relationship_index("test_relationship_index", key, value) 
-      new_index.first["self"].should == new_relationship["self"]
+      expect(new_index.first["self"]).to eq(new_relationship["self"])
       @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship)
     end
 
@@ -330,7 +330,7 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship)
       new_index = @neo.find_relationship_index("test_relationship_index", "#{key}: #{value}")
-      new_index.first["self"].should == new_relationship["self"]
+      expect(new_index.first["self"]).to eq(new_relationship["self"])
       @neo.remove_relationship_from_index("test_relationship_index", key, value, new_relationship)
     end
 
@@ -345,10 +345,10 @@ describe Neography::Rest do
       existing_node1 = @neo.get_node_index("test_node_index", key, value1)
       existing_node2 = @neo.get_node_index("test_node_index", key, value2)
       new_relationship = @neo.create_relationship("friends", existing_node1, existing_node2)
-      new_relationship["start"].should_not be_nil
-      new_relationship["start"].should == new_node1["self"]
-      new_relationship["end"].should_not be_nil
-      new_relationship["end"].should == new_node2["self"]
+      expect(new_relationship["start"]).not_to be_nil
+      expect(new_relationship["start"]).to eq(new_node1["self"])
+      expect(new_relationship["end"]).not_to be_nil
+      expect(new_relationship["end"]).to eq(new_node2["self"])
       @neo.remove_node_from_index("test_node_index", new_node1) 
       @neo.remove_node_from_index("test_node_index", new_node2) 
     end
@@ -358,72 +358,72 @@ describe Neography::Rest do
   describe "auto indexes" do
 
     it "can check the status of node auto index" do
-      @neo.get_node_auto_index_status.should satisfy{|status| [true, false].include?(status)}
+      expect(@neo.get_node_auto_index_status).to satisfy{|status| [true, false].include?(status)}
     end
   
     it "can check the status of relationship auto index" do
-      @neo.get_relationship_auto_index_status.should satisfy{|status| [true, false].include?(status)}
+      expect(@neo.get_relationship_auto_index_status).to satisfy{|status| [true, false].include?(status)}
     end
 
     it "can change the node auto index status" do
       @neo.set_node_auto_index_status(true)
-      @neo.get_node_auto_index_status.should be_true
+      expect(@neo.get_node_auto_index_status).to be true
     end
 
     it "can change the relationship auto index status" do
       @neo.set_relationship_auto_index_status(true)
-      @neo.get_relationship_auto_index_status.should be_true
+      expect(@neo.get_relationship_auto_index_status).to be true
     end
 
     it "can get a list of auto indexed node properties" do
       @neo.set_node_auto_index_status(true)
       @neo.create_node_auto_index
       @neo.add_node_auto_index_property("name")
-      @neo.get_node_auto_index_properties.should == ["name"]
+      expect(@neo.get_node_auto_index_properties).to eq(["name"])
     end
 
     it "can get a list of auto indexed relationship properties" do
       @neo.set_relationship_auto_index_status(true)
       @neo.create_relationship_auto_index
       @neo.add_relationship_auto_index_property("weight")
-      @neo.get_relationship_auto_index_properties.should == ["weight"]
+      expect(@neo.get_relationship_auto_index_properties).to eq(["weight"])
     end
 
    it "can remove a property from the auto indexed node properties" do
       @neo.add_node_auto_index_property("name")
       @neo.add_node_auto_index_property("label")
-      @neo.get_node_auto_index_properties.should == ["name", "label"]
+      expect(@neo.get_node_auto_index_properties).to eq(["name", "label"])
       @neo.remove_node_auto_index_property("label")   
-      @neo.get_node_auto_index_properties.should == ["name"]
+      expect(@neo.get_node_auto_index_properties).to eq(["name"])
    end
 
    it "can remove a property from the auto indexed relationship properties" do
       @neo.add_relationship_auto_index_property("weight")
       @neo.add_relationship_auto_index_property("strength")
-      @neo.get_relationship_auto_index_properties.should == ["weight", "strength"]
+      expect(@neo.get_relationship_auto_index_properties).to match_array(["weight", "strength"])
       @neo.remove_relationship_auto_index_property("strength")   
-      @neo.get_relationship_auto_index_properties.should == ["weight"]
+      expect(@neo.get_relationship_auto_index_properties).to eq(["weight"])
    end
 
     it "can get a node from an automatic index" do
       new_node = @neo.create_node("name" => "Max")
       existing_nodes = @neo.get_node_auto_index("name", "Max")
-      existing_nodes.collect{|n| n["self"]}.include?(new_node["self"]).should be_true 
+      expect(existing_nodes.collect{|n| n["self"]}.include?(new_node["self"])).to be true 
     end
 
     it "can query a node from an automatic index using key value" do
       new_node = @neo.create_node("name" => "Max")
       existing_nodes = @neo.find_node_auto_index("name", "Max")
-      existing_nodes.collect{|n| n["self"]}.include?(new_node["self"]).should be_true 
+      expect(existing_nodes.collect{|n| n["self"]}.include?(new_node["self"])).to be true 
     end
 
     it "can query a node from an automatic index" do
       new_node = @neo.create_node("name" => "Max")
       existing_nodes = @neo.find_node_auto_index("name:Max")
-      existing_nodes.collect{|n| n["self"]}.include?(new_node["self"]).should be_true
+      expect(existing_nodes.collect{|n| n["self"]}.include?(new_node["self"])).to be true
       # check that more complex queries are correctly handled
       existing_nodes = @neo.find_node_auto_index("name:Max OR name:Max")
-      existing_nodes.collect{|n| n["self"]}.include?(new_node["self"]).should be_true
+      expect(existing_nodes.collect{|n| n["self"]}.include?(new_node["self"])).to be true
     end
 
     it "can get a relationship from an automatic index" do
@@ -431,7 +431,7 @@ describe Neography::Rest do
       new_node2 = @neo.create_node("name" => "Peter")
       new_relationship = @neo.create_relationship("friends", new_node1, new_node2, {"weight" => 5})
       existing_rels = @neo.get_relationship_auto_index("weight", 5)
-      existing_rels.collect{|n| n["self"]}.include?(new_relationship["self"]).should be_true 
+      expect(existing_rels.collect{|n| n["self"]}.include?(new_relationship["self"])).to be true 
     end
 
     it "can query a relationship from an automatic index using key value" do
@@ -439,7 +439,7 @@ describe Neography::Rest do
       new_node2 = @neo.create_node("name" => "Peter")
       new_relationship = @neo.create_relationship("friends", new_node1, new_node2, {"weight" => 5})
       existing_rels = @neo.find_relationship_auto_index("weight", 5)
-      existing_rels.collect{|n| n["self"]}.include?(new_relationship["self"]).should be_true 
+      expect(existing_rels.collect{|n| n["self"]}.include?(new_relationship["self"])).to be true 
     end
 
     it "can query a relationship from an automatic index" do
@@ -447,7 +447,7 @@ describe Neography::Rest do
       new_node2 = @neo.create_node("name" => "Peter")
       new_relationship = @neo.create_relationship("friends", new_node1, new_node2, {"weight" => 5})
       existing_rels = @neo.find_relationship_auto_index("weight:5")
-      existing_rels.collect{|n| n["self"]}.include?(new_relationship["self"]).should be_true 
+      expect(existing_rels.collect{|n| n["self"]}.include?(new_relationship["self"])).to be true 
     end
 
   end
@@ -459,7 +459,7 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_node_to_index("test_node_index", key, value, new_node) 
       new_index = @neo.get_node_index("test_node_index", key, value) 
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.drop_node_index("test_node_index")
       expect { @neo.get_node_index("test_node_index", key, value) }.to raise_error Neography::NotFoundException
     end
@@ -472,7 +472,7 @@ describe Neography::Rest do
       value = generate_text
       @neo.add_relationship_to_index("test_relationship_index", key, value, new_relationship) 
       new_index = @neo.get_relationship_index("test_relationship_index", key, value) 
-      new_index.should_not be_nil
+      expect(new_index).not_to be_nil
       @neo.drop_relationship_index("test_relationship_index") 
       expect { @neo.get_relationship_index("test_relationship_index", key, value) }.to raise_error Neography::NotFoundException
     end