remove mocha from several canvas gems

refs CNVS-34039
refs CNVS-34040

test plan: specs should pass

Change-Id: I9ef587edd9a5f47fcbe2f6fee74cc4c52efca6fb
Reviewed-on: https://gerrit.instructure.com/98410
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>

gems/activesupport-suspend_callbacks/activesupport-suspend_callbacks.gemspec

@@ -18,6 +18,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~>1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "2.99.0"
-  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "rspec", "3.5.0"
 end

gems/activesupport-suspend_callbacks/spec/active_support/callbacks/suspension_spec.rb

@@ -17,7 +17,6 @@
 #
 
 require 'spec_helper'
-require 'mocha/api'
 
 describe ActiveSupport::Callbacks::Suspension do
   before do
@@ -69,24 +68,24 @@ describe ActiveSupport::Callbacks::Suspension do
 
   describe "suspend_callbacks" do
     it "should suspend all callbacks by default" do
-      @instance.expects(:validate).never
-      @instance.expects(:publish).never
+      expect(@instance).to receive(:validate).never
+      expect(@instance).to receive(:publish).never
       @instance.suspend_callbacks{ @instance.save }
     end
 
     it "should treat suspended callbacks as successful" do
-      @instance.expects(:persist).once
+      expect(@instance).to receive(:persist).once
       @instance.suspend_callbacks{ @instance.save }
     end
 
     it "should only suspend given callbacks" do
-      @instance.expects(:validate).never
-      @instance.expects(:publish).once
+      expect(@instance).to receive(:validate).never
+      expect(@instance).to receive(:publish).once
       @instance.suspend_callbacks(:validate) { @instance.save }
     end
 
     it "should only suspend callbacks of the given kind" do
-      @instance.expects(:validate).once
+      expect(@instance).to receive(:validate).once
       if @rails2
         @instance.suspend_callbacks(kind: :before_save) { @instance.update }
       else
@@ -96,8 +95,8 @@ describe ActiveSupport::Callbacks::Suspension do
 
     unless @rails2
       it "should only suspend callbacks of the given type" do
-        @instance.expects(:validate).never
-        @instance.expects(:publish).once
+        expect(@instance).to receive(:validate).never
+        expect(@instance).to receive(:publish).once
         @instance.suspend_callbacks(type: :before) { @instance.save }
       end
     end
@@ -105,8 +104,8 @@ describe ActiveSupport::Callbacks::Suspension do
 
   describe "nesting" do
     it "should combine suspensions from various levels" do
-      @instance.expects(:validate).never
-      @instance.expects(:publish).never
+      expect(@instance).to receive(:validate).never
+      expect(@instance).to receive(:publish).never
       @instance.suspend_callbacks(:validate) do
         @instance.suspend_callbacks(:publish) do
           @instance.save
@@ -115,8 +114,8 @@ describe ActiveSupport::Callbacks::Suspension do
     end
 
     it "should restore correct subset of suspensions after leaving block" do
-      @instance.expects(:validate).never
-      @instance.expects(:publish).once
+      expect(@instance).to receive(:validate).never
+      expect(@instance).to receive(:publish).once
       @instance.suspend_callbacks(:validate) do
         @instance.suspend_callbacks(:publish) do
           @instance.save
@@ -128,24 +127,24 @@ describe ActiveSupport::Callbacks::Suspension do
 
   describe "inheritance" do
     it "should apply suspensions from the class to instances" do
-      @instance.expects(:validate).never
-      @instance.expects(:publish).never
+      expect(@instance).to receive(:validate).never
+      expect(@instance).to receive(:publish).never
       @class.suspend_callbacks{ @instance.save }
     end
 
     it "should apply suspensions from a superclass to instances of a subclass" do
       subclass = Class.new(@class)
       instance = subclass.new
-      instance.expects(:validate).never
-      instance.expects(:publish).never
+      expect(instance).to receive(:validate).never
+      expect(instance).to receive(:publish).never
       @class.suspend_callbacks{ instance.save }
     end
 
     it "should combine suspensions from various levels" do
       subclass = Class.new(@class)
       instance = subclass.new
-      instance.expects(:validate).never
-      instance.expects(:publish).never
+      expect(instance).to receive(:validate).never
+      expect(instance).to receive(:publish).never
       # only suspends :validate from save
       instance.suspend_callbacks(:validate, kind: (@rails2 ? :before_save : :save)) do
         # only suspends :publish
@@ -161,14 +160,14 @@ describe ActiveSupport::Callbacks::Suspension do
     end
 
     it "should keep class suspensions independent per thread" do
-      @instance.expects(:validate).never
-      @instance.expects(:publish).once
+      expect(@instance).to receive(:validate).never
+      expect(@instance).to receive(:publish).once
 
       @class.suspend_callbacks(:validate) do
         Thread.new do
           @instance2 = @class.new
-          @instance2.expects(:validate).once
-          @instance2.expects(:publish).once
+          expect(@instance2).to receive(:validate).once
+          expect(@instance2).to receive(:publish).once
           @instance2.save
         end.join
 

gems/activesupport-suspend_callbacks/spec/spec_helper.rb

@@ -14,10 +14,8 @@ end
 require "active_support/callbacks/suspension"
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-  config.mock_with :mocha
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing

gems/diigo/diigo.gemspec

@@ -18,6 +18,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "2.14.1"
-  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "rspec", "3.5.0"
 end

gems/diigo/spec/spec_helper.rb

@@ -1,14 +1,9 @@
 require 'diigo'
-require 'mocha'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-  config.color_enabled true
+  config.color = true
 
   config.order = 'random'
-
-  config.mock_framework = :mocha
-
 end

gems/google_drive/google_drive.gemspec

@@ -19,9 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "3.2.0"
+  spec.add_development_dependency "rspec", "3.5.0"
   spec.add_development_dependency "byebug"
-  spec.add_development_dependency "mocha"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "webmock"
 end

gems/google_drive/spec/google_drive/connection_spec.rb

@@ -41,7 +41,7 @@ describe GoogleDrive::Connection do
         'content-disposition' => 'attachment;filename="Testing.docx"'
       }
 
-      entry = stub('Entry', extension: "not")
+      entry = double('Entry', extension: "not")
       file_extension = google_docs.send(:file_extension_from_header, headers, entry)
 
       expect(file_extension).to eq("docx")
@@ -54,7 +54,7 @@ describe GoogleDrive::Connection do
         'content-disposition' => 'attachment"'
       }
 
-      entry = stub('Entry', extension: "not")
+      entry = double('Entry', extension: "not")
       file_extension = google_docs.send(:file_extension_from_header, headers, entry)
       expect(file_extension).to eq("not")
     end
@@ -66,7 +66,7 @@ describe GoogleDrive::Connection do
         'content-disposition' => 'attachment"'
       }
 
-      entry = stub('Entry', extension: "")
+      entry = double('Entry', extension: "")
       file_extension = google_docs.send(:file_extension_from_header, headers, entry)
       expect(file_extension).to eq("unknown")
     end
@@ -75,7 +75,7 @@ describe GoogleDrive::Connection do
       google_docs = GoogleDrive::Connection.new(token, secret)
 
       headers = {}
-      entry = stub('Entry', extension: nil)
+      entry = double('Entry', extension: nil)
 
       file_extension = google_docs.send(:file_extension_from_header, headers, entry)
       expect(file_extension).to eq("unknown")
@@ -171,7 +171,7 @@ describe GoogleDrive::Connection do
 
       it "wraps a timeout in a drive connection exception" do
 
-        Timeout.stubs(:timeout).raises(Timeout::Error)
+        allow(Timeout).to receive(:timeout).and_raise(Timeout::Error)
         expect{ connection.download("42", nil) }.to(
           raise_error(GoogleDrive::ConnectionException) do |e|
             expect(e.message).to eq("Google Drive connection timed out")
@@ -183,7 +183,7 @@ describe GoogleDrive::Connection do
     describe "#create_doc" do
       it "wraps a timeout in a drive connection exception" do
 
-        Timeout.stubs(:timeout).raises(Timeout::Error)
+        allow(Timeout).to receive(:timeout).and_raise(Timeout::Error)
         expect{ connection.create_doc("Docname") }.to(
           raise_error(GoogleDrive::ConnectionException) do |e|
             expect(e.message).to eq("Google Drive connection timed out")

gems/google_drive/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'google_drive'
 require 'byebug'
-require 'mocha'
 require 'timecop'
 require 'webmock/rspec'
 
@@ -12,12 +11,11 @@ end
 
 WebMock.disable_net_connect!(allow_localhost: true)
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.color = true
 
   config.order = 'random'
-  config.mock_framework = :mocha
 end
 
 
@@ -25,4 +23,4 @@ module Rails
   def self.cache
     @cache ||= ActiveSupport::Cache::MemoryStore.new
   end
-end
+end

gems/live_events/live_events.gemspec

@@ -21,7 +21,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "2.99.0"
-  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "rspec", "3.5.0"
 end
-

gems/live_events/spec/live_events/async_worker_spec.rb

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe LiveEvents::AsyncWorker do
   before(:each) do
     LiveEvents.max_queue_size = -> { 100 }
-    LiveEvents.logger = mock()
+    LiveEvents.logger = double()
     @worker = LiveEvents::AsyncWorker.new(false)
   end
 

gems/live_events/spec/live_events/client_spec.rb

@@ -21,7 +21,7 @@ require 'aws-sdk'
 
 describe LiveEvents::Client do
   def stub_config(opts = {})
-    LiveEvents::Client.stubs(:config).returns({
+    allow(LiveEvents::Client).to receive(:config).and_return({
       'kinesis_stream_name' => 'stream',
       'aws_access_key_id' => 'access_key',
       'aws_secret_access_key_dec' => 'secret_key',
@@ -31,20 +31,24 @@ describe LiveEvents::Client do
 
   before(:each) do
     stub_config
-    LiveEvents.logger = mock()
+    LiveEvents.logger = double()
     LiveEvents.max_queue_size = -> { 100 }
 
-    @kclient = mock()
-    Aws::Kinesis::Client.stubs(:new).returns(@kclient)
+    @kclient = double()
+    allow(Aws::Kinesis::Client).to receive(:new).and_return(@kclient)
 
     @client = LiveEvents::Client.new
   end
 
+  RSpec::Matchers.define :a_live_events_payload do |payload|
+    match do |actual|
+      to_compare = actual.merge({ data: JSON.parse(actual[:data]) })
+      to_compare == payload
+    end
+  end
+
   def expect_put_record(payload)
-    @kclient.expects(:put_record).with() { |params|
-      params = params.merge({ data: JSON.parse(params[:data]) })
-      params == payload
-    }
+    expect(@kclient).to receive(:put_record).with(a_live_events_payload(payload))
   end
 
   describe "config" do
@@ -53,7 +57,7 @@ describe LiveEvents::Client do
         "aws_endpoint" => "http://example.com:6543/"
       })
 
-      res[:endpoint].should eq("http://example.com:6543/")
+      expect(res[:endpoint]).to eq("http://example.com:6543/")
     end
   end
 

gems/live_events/spec/spec_helper.rb

@@ -2,14 +2,10 @@ require 'live_events'
 require 'thread'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.color = true
   config.order = 'random'
-  config.mock_framework = :mocha
 end
 
 Thread.abort_on_exception = true
-
-require 'mocha'