spec/spec_helper.rb in rhoconnect-6.0.11 vs spec/spec_helper.rb in rhoconnect-6.2.0

@@ -141,11 +141,11 @@
   def json_clone(data)
     JSON.parse(data.to_json)
   end
 
   def setup_post_yield(response)
-    RestClient.stub(:post).and_yield(response, nil, nil)
+    allow(RestClient).to receive(:post).and_yield(response, nil, nil)
   end
 
   def set_state(state,append=false)
     state.each do |dockey,data|
       if data.is_a?(Hash) or data.is_a?(Array)
@@ -184,15 +184,15 @@
   def verify_result(result)
     result.keys.sort.each do |dockey|
       expected = result[dockey]
       begin
         if expected.is_a?(Hash)
-          Store.get_data(dockey).should == expected
+          expect(Store.get_data(dockey)).to eq(expected)
         elsif expected.is_a?(Array)
-          Store.get_data(dockey,Array).should == expected
+          expect(Store.get_data(dockey, Array)).to eq(expected)
         else
-          Store.get_value(dockey).should == expected
+          expect(Store.get_value(dockey)).to eq(expected)
         end
       rescue RSpec::Expectations::ExpectationNotMetError => e
         message = "\nVerifying `#{dockey}`\n\n" + e.to_s
         Kernel::raise(RSpec::Expectations::ExpectationNotMetError.new(message))
       end
@@ -202,15 +202,15 @@
   def verify_doc_result(docobj, result)
     result.keys.sort.each do |dockey|
       expected = result[dockey]
       begin
         if expected.is_a?(Hash)
-          docobj.get_data(dockey).should == expected
+          expect(docobj.get_data(dockey)).to eq(expected)
         elsif expected.is_a?(Array)
-          docobj.get_data(dockey,Array).should == expected
+          expect(docobj.get_data(dockey,Array)).to eq(expected)
         else
-          docobj.get_value(dockey).should == expected
+          expect(docobj.get_value(dockey)).to eq(expected)
         end
       rescue RSpec::Expectations::ExpectationNotMetError => e
         message = "\nVerifying `#{dockey}`\n\n" + e.to_s
         Kernel::raise(RSpec::Expectations::ExpectationNotMetError.new(message))
       end
@@ -220,10 +220,10 @@
   def verify_source_queue_data(source, result)
     result.keys.sort.each do |dockey|
       expected = result[dockey]
       begin
         data,assoc_keys = source.get_queue(dockey)
-        data.should == expected
+        expect(data).to eq(expected)
       rescue RSpec::Expectations::ExpectationNotMetError => e
         message = "\nVerifying `#{dockey}`\n\n" + e.to_s
         Kernel::raise(RSpec::Expectations::ExpectationNotMetError.new(message))
       end
     end