spec/support/mock_fedora.rb in active-fedora-6.8.0 vs spec/support/mock_fedora.rb in active-fedora-7.0.0.pre1

@@ -1,44 +1,45 @@
 def mock_client
   return @mock_client if @mock_client
-  @mock_client = double('client')
-  @getter = double('getter')
-  allow(@getter).to receive(:get).and_return('')
-  allow(@mock_client).to receive(:[]).with('describe?xml=true').and_return('')
-  @mock_client
+  @mock_client = double("client")
+  @getter = double("getter")
+  @getter.stub(:get).and_return('')
+  @mock_client.stub(:[]).with("describe?xml=true").and_return('')
+  @mock_client 
 end
-
-def stub_get(pid, datastreams = nil, record_exists = false)
+  
+def stub_get(pid, datastreams=nil, record_exists=false)
   pid.gsub!(/:/, '%3A')
   if record_exists
-    allow(mock_client).to receive(:[]).with("objects/#{pid}?format=xml").and_return(double('get getter', :get => 'foobar'))
+    mock_client.stub(:[]).with("objects/#{pid}?format=xml").and_return(double('get getter', :get=>'foobar'))
   else
-    allow(mock_client).to receive(:[]).with("objects/#{pid}?format=xml").and_raise(RestClient::ResourceNotFound)
+    mock_client.stub(:[]).with("objects/#{pid}?format=xml").and_raise(RestClient::ResourceNotFound)
   end
-  allow(mock_client).to receive(:[]).with("objects/#{pid}/datastreams?format=xml").and_return(@getter)
+  mock_client.stub(:[]).with("objects/#{pid}/datastreams?format=xml").and_return(@getter)
   datastreams ||= ['someData', 'withText', 'withText2', 'RELS-EXT']
   datastreams.each do |dsid|
-    allow(mock_client).to receive(:[]).with("objects/#{pid}/datastreams/#{dsid}?format=xml").and_return(@getter)
+    mock_client.stub(:[]).with("objects/#{pid}/datastreams/#{dsid}?format=xml").and_return(@getter)
   end
 end
 
-def stub_ingest(pid = nil)
+def stub_ingest(pid=nil)
   n = pid ? pid.gsub(/:/, '%3A') : nil
-  expect(mock_client).to receive(:[]).with("objects/#{n || 'new'}").and_return(double('ingester', :post => pid))
+  mock_client.should_receive(:[]).with("objects/#{n || 'new'}").and_return(double("ingester", :post=>pid))
 end
 
 def stub_add_ds(pid, dsids)
   pid.gsub!(/:/, '%3A')
   dsids.each do |dsid|
-    client = allow(mock_client).to receive(:[]).with(no_args) do |params|
+    client = mock_client.stub(:[]).with do |params|
       /objects\/#{pid}\/datastreams\/#{dsid}/.match(params)
     end
-    client.and_return(double('ds_adder', :post => pid, :get => ''))
+    client.and_return(double("ds_adder", :post=>pid, :get=>''))
   end
 end
 
 def stub_get_content(pid, dsids)
   pid.gsub!(/:/, '%3A')
   dsids.each do |dsid|
-    allow(mock_client).to receive(:[]).with(no_args) { |params| /objects\/#{pid}\/datastreams\/#{dsid}\/content/.match(params)}.and_return(double('content_accessor', :post => pid, :get => ''))
+    mock_client.stub(:[]).with { |params| /objects\/#{pid}\/datastreams\/#{dsid}\/content/.match(params)}.and_return(double("content_accessor", :post=>pid, :get=>''))
   end
 end
+