rhoconnect 5.5.18 → 7.4.1

data/spec/server/stats_spec.rb

@@ -13,11 +13,11 @@ describe "Middleware" do
     @now = 10.0
     Store.flush_all
     app = double('app')
-    app.stub(:call)
+    allow(app).to receive(:call)
     Rhoconnect.stats = true
     Rhoconnect::Server.enable :stats
     @middleware_new_routes = Rhoconnect::Middleware::Stats.new(app)
-    Store.stub(:lock).and_yield
+    allow(Store).to receive(:lock).and_yield
   end
 
   after(:each) do
@@ -27,7 +27,7 @@ describe "Middleware" do
 
   it "should compute http average" do
     @incr = 0
-    Time.stub(:now).and_return do
+    allow(Time).to receive(:now) do
       if @incr > 0
         @now += 0.3
         @incr -= 1
@@ -43,15 +43,15 @@ describe "Middleware" do
     }
     10.times { @incr = 3; @middleware_new_routes.call(env) }
     metric = 'http:GET:/api/application/query:SampleAdapter'
-    Rhoconnect::Stats::Record.key(metric).should == "stat:#{metric}"
+    expect(Rhoconnect::Stats::Record.key(metric)).to eq("stat:#{metric}")
 
     # The conversion algorithm (float to string) currently checks two precisions.
     # it tries 16 digits and if that's not enough it then uses 17.
-    Rhoconnect::Stats::Record.range(metric, 0, -1).should == [
+    expect(Rhoconnect::Stats::Record.range(metric, 0, -1)).to eq([
       "2.0,0.6000000000000014:12",
       "2.0,0.6000000000000014:14",
       "2.0,0.6000000000000014:16",
       "2.0,0.6000000000000014:18"
-    ]
+    ])
   end
-end
+end

data/spec/server/x_domain_session_wrapper_spec.rb

@@ -50,11 +50,11 @@ describe "XDomainSessionWrapper middleware" do
         'QUERY_STRING' => PROPER_QUERY_STRING
     }
     status, headers, body = @middleware_new_routes.call(env)
-    200.should == status
-    COOKIE_ANOTHER_NV.should == headers['Set-Cookie']
-    COOKIE_NV.should_not == env['HTTP_COOKIE']
-    headers['Content-Length'].should == body[0].length.to_s
-    ''.should == body[0]
+    expect(status).to eq(200)
+    expect(COOKIE_ANOTHER_NV). to eq(headers['Set-Cookie'])
+    expect(COOKIE_NV).not_to eq(env['HTTP_COOKIE'])
+    expect(headers['Content-Length']).to eq(body[0].length.to_s)
+    expect(body[0]).to eq('')
   end
 
   it "should skip if it isn't a sync protocol URI, for old REST routes" do
@@ -63,11 +63,11 @@ describe "XDomainSessionWrapper middleware" do
         'QUERY_STRING' => PROPER_QUERY_STRING
     }
     status, headers, body = @middleware_old_routes.call(env)
-    200.should == status
-    COOKIE_ANOTHER_NV.should == headers['Set-Cookie']
-    COOKIE_NV.should_not == env['HTTP_COOKIE']
-    headers['Content-Length'].should == body[0].length.to_s
-    ''.should == body[0]
+    expect(status).to eq(200)
+    expect(COOKIE_ANOTHER_NV). to eq(headers['Set-Cookie'])
+    expect(COOKIE_NV).not_to eq(env['HTTP_COOKIE'])
+    expect(headers['Content-Length']).to eq(body[0].length.to_s)
+    expect(body[0]).to eq('')
   end
 
   it "should process cookie from QUERY_STRING if it is a sync protocol URI, for new REST routes" do
@@ -76,11 +76,11 @@ describe "XDomainSessionWrapper middleware" do
         'QUERY_STRING' => PROPER_QUERY_STRING
     }
     status, headers, body = @middleware_new_routes.call(env)
-    200.should == status
-    COOKIE_ANOTHER_NV.should == headers['Set-Cookie']
-    env['HTTP_COOKIE'].should == COOKIE_VALUE
-    headers['Content-Length'].should == body[0].length.to_s
-    ''.should == body[0]
+    expect(status).to eq(200)
+    expect(COOKIE_ANOTHER_NV). to eq(headers['Set-Cookie'])
+    expect(env['HTTP_COOKIE']).to eq(COOKIE_VALUE)
+    expect(headers['Content-Length']).to eq(body[0].length.to_s)
+    expect(body[0]).to eq('')
   end
 
   it "should process cookie from QUERY_STRING if it is a sync protocol URI, for old REST routes" do
@@ -89,11 +89,11 @@ describe "XDomainSessionWrapper middleware" do
         'QUERY_STRING' => PROPER_QUERY_STRING
     }
     status, headers, body = @middleware_old_routes.call(env)
-    200.should == status
-    COOKIE_ANOTHER_NV.should == headers['Set-Cookie']
-    env['HTTP_COOKIE'].should == COOKIE_VALUE
-    headers['Content-Length'].should == body[0].length.to_s
-    ''.should == body[0]
+    expect(status).to eq(200)
+    expect(COOKIE_ANOTHER_NV). to eq(headers['Set-Cookie'])
+    expect(env['HTTP_COOKIE']).to eq(COOKIE_VALUE)
+    expect(headers['Content-Length']).to eq(body[0].length.to_s)
+    expect(body[0]).to eq('')
   end
 
   it "shouldn't process cookie from QUERY_STRING if there is no appropriate parameter name or value, for new REST routes" do
@@ -102,11 +102,11 @@ describe "XDomainSessionWrapper middleware" do
         'QUERY_STRING' => WRONG_QUERY_STRING
     }
     status, headers, body = @middleware_new_routes.call(env)
-    200.should == status
-    COOKIE_ANOTHER_NV.should == headers['Set-Cookie']
-    env['HTTP_COOKIE'].should_not == COOKIE_VALUE
-    headers['Content-Length'].should == body[0].length.to_s
-    ''.should == body[0]
+    expect(status).to eq(200)
+    expect(COOKIE_ANOTHER_NV). to eq(headers['Set-Cookie'])
+    expect(env['HTTP_COOKIE']).not_to eq(COOKIE_VALUE)
+    expect(headers['Content-Length']).to eq(body[0].length.to_s)
+    expect(body[0]).to eq('')
   end
 
   it "shouldn't process cookie from QUERY_STRING if there is no appropriate parameter name or value, for old REST routes" do
@@ -115,11 +115,11 @@ describe "XDomainSessionWrapper middleware" do
         'QUERY_STRING' => WRONG_QUERY_STRING
     }
     status, headers, body = @middleware_old_routes.call(env)
-    200.should == status
-    COOKIE_ANOTHER_NV.should == headers['Set-Cookie']
-    env['HTTP_COOKIE'].should_not == COOKIE_VALUE
-    headers['Content-Length'].should == body[0].length.to_s
-    ''.should == body[0]
+    expect(status).to eq(200)
+    expect(COOKIE_ANOTHER_NV). to eq(headers['Set-Cookie'])
+    expect(env['HTTP_COOKIE']).not_to eq(COOKIE_VALUE)
+    expect(headers['Content-Length']).to eq(body[0].length.to_s)
+    expect(body[0]).to eq('')
   end
 
   it "should respond with cookie in a body if it is a login URI, for new REST routes" do
@@ -128,11 +128,11 @@ describe "XDomainSessionWrapper middleware" do
         'QUERY_STRING' => PROPER_QUERY_STRING
     }
     status, headers, body = @middleware_new_routes.call(env)
-    200.should == status
-    headers['Set-Cookie'].should == COOKIE_ANOTHER_NV
-    env['HTTP_COOKIE'].should == COOKIE_VALUE
-    headers['Content-Length'].should == body[0].length.to_s
-    ''.should_not == body[0]
+    expect(status).to eq(200)
+    expect(headers['Set-Cookie']).to eq(COOKIE_ANOTHER_NV)
+    expect(env['HTTP_COOKIE']).to eq(COOKIE_VALUE)
+    expect(headers['Content-Length']).to eq(body[0].length.to_s)
+    expect('').not_to eq(body[0])
   end
 
   it "should respond with cookie in a body if it is a login URI, for old REST routes" do
@@ -141,10 +141,10 @@ describe "XDomainSessionWrapper middleware" do
         'QUERY_STRING' => PROPER_QUERY_STRING
     }
     status, headers, body = @middleware_old_routes.call(env)
-    200.should == status
-    headers['Set-Cookie'].should == COOKIE_ANOTHER_NV
-    env['HTTP_COOKIE'].should == COOKIE_VALUE
-    headers['Content-Length'].should == body[0].length.to_s
-    ''.should_not == body[0]
+    expect(status).to eq(200)
+    expect(headers['Set-Cookie']).to eq(COOKIE_ANOTHER_NV)
+    expect(env['HTTP_COOKIE']).to eq(COOKIE_VALUE)
+    expect(headers['Content-Length']).to eq(body[0].length.to_s)
+    expect('').not_to eq(body[0])
   end
 end

data/spec/source_adapter_spec.rb

@@ -61,7 +61,7 @@ describe "Model" do
 
   it "should create model with trailing spaces" do
     s = setup_adapter('SimpleAdapter ')
-    Rhoconnect::Model::Base.create(s).is_a?(SimpleAdapter).should be_true
+    Rhoconnect::Model::Base.create(s).is_a?(SimpleAdapter).should be  true
   end
 
   describe "model methods" do
@@ -152,4 +152,4 @@ describe "Model" do
       end
     end
   end
-end
+end

data/spec/source_sync_spec.rb

@@ -578,7 +578,7 @@ describe "SourceSync" do
       set_source_queue_state(@s, {@create_queue_name => [[@s.name, [['5', { 'name' => 'Android', 'link' => '1', 'force_duplicate_error' => '1' }]]]]},@c.id,true)
       @sscud.do_cud
       verify_source_queue_data(@s, @create_queue_name => [])
-      verify_doc_result(@c, :create_errors => {"5-error"=>{"message"=>"Error during create: object confict detected"}, "5"=>{"name"=>"Android", "link"=>"1", 'force_duplicate_error' => '1'}} )
+      verify_doc_result(@c, :create_errors => {"5-error"=>{"message"=>"Error during create: object conflict detected"}, "5"=>{"name"=>"Android", "link"=>"1", 'force_duplicate_error' => '1'}} )
     end
 
     it "should detect create conflict in the intermediate state create and skip the duplicate record create" do
@@ -609,7 +609,7 @@ describe "SourceSync" do
       @sscud.do_cud
 
       verify_source_queue_data(@s, @update_queue_name => [])
-      verify_doc_result(@c, :update_errors => {"4-error"=>{"message"=>"Error during update: object confict detected"}, "4"=>{"name"=>"ErrorName", 'force_duplicate_error' => '1'}})
+      verify_doc_result(@c, :update_errors => {"4-error"=>{"message"=>"Error during update: object conflict detected"}, "4"=>{"name"=>"ErrorName", 'force_duplicate_error' => '1'}})
       verify_doc_result(@c, :update_rollback => {'4'=> {'name' => 'Apple'}})
     end
 
@@ -644,7 +644,7 @@ describe "SourceSync" do
       @sscud.do_cud
 
       verify_source_queue_data(@s, @update_queue_name => [])
-      verify_doc_result(@c, :update_errors => {"4-error"=>{"message"=>"Error during update: object confict detected"}, "4"=>{"name"=>"ErrorName", 'force_duplicate_error' => '1'}})
+      verify_doc_result(@c, :update_errors => {"4-error"=>{"message"=>"Error during update: object conflict detected"}, "4"=>{"name"=>"ErrorName", 'force_duplicate_error' => '1'}})
       verify_doc_result(@c, :update_rollback => {'4'=> {'name' => 'Apple'}})
     end
 
@@ -704,7 +704,7 @@ describe "SourceSync" do
       @sscud.do_cud
 
       verify_source_queue_data(@s, @delete_queue_name => [])
-      verify_doc_result(@c, :delete_errors => {"4-error"=>{"message"=>"Error during delete: object confict detected"}, "4"=>{"name"=>"Apple", 'force_duplicate_error' => '1'}})
+      verify_doc_result(@c, :delete_errors => {"4-error"=>{"message"=>"Error during delete: object conflict detected"}, "4"=>{"name"=>"Apple", 'force_duplicate_error' => '1'}})
     end
   end
 

data/spec/spec_helper.rb

@@ -143,7 +143,7 @@ module TestHelpers
   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)
@@ -186,11 +186,11 @@ module TestHelpers
       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
@@ -204,11 +204,11 @@ module TestHelpers
       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
@@ -222,7 +222,7 @@ module TestHelpers
       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))

data/spec/stats/record_spec.rb

@@ -16,13 +16,13 @@ describe "Record" do
   end
 
   it "should add metric to the record and trim record size" do
-    Time.stub(:now).and_return { @now }
+    allow(Time).to receive(:now) { @now }
     10.times { @now += 1; Rhoconnect::Stats::Record.add('foo') }
     Store.zrange('stat:foo', 0, -1).should == ["2:12", "2:14", "2:16", "2:18"]
   end
 
   it "should add single record" do
-    Time.stub(:now).and_return { @now += 1; @now }
+    allow(Time).to receive(:now) { @now += 1; @now }
     Rhoconnect::Stats::Record.add('foo')
     Store.zrange('stat:foo', 0, -1).should == ["1:10"]
   end
@@ -49,7 +49,7 @@ describe "Record" do
   end
 
   it "should add absolute metric value" do
-    Time.stub(:now).and_return { @now }
+    allow(Time).to receive(:now) { @now }
     time = 0
     4.times do
       @now += 1
@@ -62,7 +62,7 @@ describe "Record" do
   it "should update metric" do
     Rhoconnect.stats = true
     @incr = 0
-    Time.stub(:now).and_return do
+    allow(Time).to receive(:now) do
       if @incr > 0
         @now += 1
         @incr -= 1
@@ -80,13 +80,13 @@ describe "Record" do
   end
 
   it "should get range of metric values" do
-    Time.stub(:now).and_return { @now }
+    allow(Time).to receive(:now) { @now }
     10.times { @now += 1; Rhoconnect::Stats::Record.add('foo') }
     Rhoconnect::Stats::Record.range('foo', 0, 1).should == ["2:12", "2:14"]
   end
 
   it "should reset metric" do
-    Time.stub(:now).and_return { @now }
+    allow(Time).to receive(:now) { @now }
     10.times { @now += 1; Rhoconnect::Stats::Record.add('foo') }
     Store.zrange('stat:foo', 0, -1).should == ["2:12", "2:14", "2:16", "2:18"]
     Rhoconnect::Stats::Record.reset('foo')
@@ -99,4 +99,4 @@ describe "Record" do
     Rhoconnect::Stats::Record.reset_all
     Store.keys('stat:*').should == []
   end
-end
+end