spec: drop compare_json

it had critical bugs where mismatched keys would bet let through. so
instead just compare directly; rspec has good hash and array diffing nowadays,
and we just need to call as_json on a few things

Change-Id: I6147e8c988c1dc4f4e3224dc6a4e51e51b27e5f3
Reviewed-on: https://gerrit.instructure.com/104402
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

Author: ccutrer

app/models/assignment.rb

@@ -228,6 +228,7 @@ def moderation_setting_ok?
     moderated_grading
     grades_published_at
     omit_from_final_grade
+    grading_standard_id
   )
 
   def external_tool?

spec/apis/v1/assignment_groups_api_spec.rb

@@ -162,27 +162,31 @@ def setup_grading_periods
 
     expected = [
       {
-        'group_weight' => 60,
+        'group_weight' => 60.0,
         'id' => @group2.id,
         'name' => 'group2',
         'position' => 7,
         'rules' => {},
         'any_assignment_in_closed_grading_period' => false,
+        'integration_data' => {},
+        'sis_source_id' => nil,
         'assignments' => [
-          controller.assignment_json(@a3,@user,session),
-          controller.assignment_json(@a4,@user,session, include_discussion_topic: true)
+          controller.assignment_json(@a3,@user,session).as_json,
+          controller.assignment_json(@a4,@user,session, include_discussion_topic: false).as_json
         ]
       },
       {
-        'group_weight' => 40,
+        'group_weight' => 40.0,
         'id' => @group1.id,
         'name' => 'group1',
         'position' => 10,
         'rules' => {},
         'any_assignment_in_closed_grading_period' => false,
+        'integration_data' => {},
+        'sis_source_id' => nil,
         'assignments' => [
-          controller.assignment_json(@a1,@user,session),
-          controller.assignment_json(@a2,@user,session)
+          controller.assignment_json(@a1,@user,session).as_json,
+          controller.assignment_json(@a2,@user,session).as_json
         ]
       }
     ]
@@ -193,7 +197,7 @@ def setup_grading_periods
       end
     end
 
-    compare_json(json, expected)
+    expect(json).to eq expected
   end
 
   context "exclude response fields" do
@@ -385,20 +389,22 @@ def setup_grading_periods
 
     expected = [
       {
-        'group_weight' => 40,
+        'group_weight' => 40.0,
         'id' => group.id,
         'name' => 'group1',
         'position' => 10,
         'rules' => {},
         'any_assignment_in_closed_grading_period' => false,
+        'integration_data' => {},
+        'sis_source_id' => nil,
         'assignments' => [
-          controller.assignment_json(a1, @user,session),
-          controller.assignment_json(a2, @user,session)
+          controller.assignment_json(a1, @user,session).as_json,
+          controller.assignment_json(a2, @user,session).as_json
         ]
       }
     ]
 
-    compare_json(json, expected)
+    expect(json).to eq expected
   end
 
   it "should include all dates" do
@@ -426,20 +432,22 @@ def setup_grading_periods
 
     expected = [
       {
-        'group_weight' => 40,
+        'group_weight' => 40.0,
         'id' => group.id,
         'name' => 'group1',
         'position' => 10,
         'rules' => {},
         'any_assignment_in_closed_grading_period' => false,
+        'integration_data' => {},
+        'sis_source_id' => nil,
         'assignments' => [
-          controller.assignment_json(a1, @user,session, include_all_dates: true),
-          controller.assignment_json(a2, @user,session, include_all_dates: true)
+          controller.assignment_json(a1, @user,session, include_all_dates: true).as_json,
+          controller.assignment_json(a2, @user,session, include_all_dates: true).as_json
         ]
       }
     ]
 
-    compare_json(json, expected)
+    expect(json).to eq expected
   end
 
   it "should exclude deleted assignments" do

spec/apis/v1/context_module_items_api_spec.rb

@@ -135,10 +135,11 @@
               "indent" => 1,
               "completion_requirement" => { "type" => "must_view" },
               "published" => true,
-              "module_id" => @module1.id
+              "module_id" => @module1.id,
+              "new_tab" => nil
           }
       ]
-      compare_json(json, expected)
+      expect(json).to eq expected
     end
 
     context 'index with content details' do

spec/apis/v1/todo_items_api_spec.rb

@@ -23,8 +23,8 @@
   include Api
   include Api::V1::Assignment
   def update_assignment_json
-    @a1_json['assignment'] = controller.assignment_json(@a1,@user,session)
-    @a2_json['assignment'] = controller.assignment_json(@a2,@user,session)
+    @a1_json['assignment'] = controller.assignment_json(@a1,@user,session).as_json
+    @a2_json['assignment'] = controller.assignment_json(@a2,@user,session).as_json
   end
 
   def strip_secure_params(json)
@@ -100,8 +100,8 @@ def another_submission
                     :controller => "users", :action => "todo_items", :format => "json")
     update_assignment_json
     json = json.sort_by { |t| t['assignment']['id'] }
-    compare_json strip_secure_params(json.first), strip_secure_params(@a1_json)
-    compare_json strip_secure_params(json.second), strip_secure_params(@a2_json)
+    expect(strip_secure_params(json.first)).to eq strip_secure_params(@a1_json)
+    expect(strip_secure_params(json.second)).to eq strip_secure_params(@a2_json)
   end
 
   it "returns a course-specific todo list for a student" do
@@ -111,7 +111,7 @@ def another_submission
                     .first
 
     update_assignment_json
-    compare_json(strip_secure_params(json), strip_secure_params(@a1_json))
+    expect(strip_secure_params(json)).to eq strip_secure_params(@a1_json)
   end
 
   it "returns a course-specific todo list for a teacher" do
@@ -120,7 +120,7 @@ def another_submission
                     :format => "json", :course_id => @teacher_course.to_param)
                     .first
     update_assignment_json
-    compare_json(strip_secure_params(json), strip_secure_params(@a2_json))
+    expect(strip_secure_params(json)).to eq strip_secure_params(@a2_json)
   end
 
   it "should return a list for users who are both teachers and students" do
@@ -131,8 +131,8 @@ def another_submission
     @a1_json.deep_merge!({ 'assignment' => { 'needs_grading_count' => 0 } })
     json = json.sort_by { |t| t['assignment']['id'] }
     update_assignment_json
-    compare_json(strip_secure_params(json.first), strip_secure_params(@a1_json))
-    compare_json(strip_secure_params(json.second), strip_secure_params(@a2_json))
+    expect(strip_secure_params(json.first)).to eq strip_secure_params(@a1_json)
+    expect(strip_secure_params(json.second)).to eq strip_secure_params(@a2_json)
   end
 
   it "should ignore a todo item permanently" do
@@ -170,7 +170,7 @@ def another_submission
     @a2_json['needs_grading_count'] = 2
     @a2_json['assignment']['needs_grading_count'] = 2
     update_assignment_json
-    compare_json(strip_secure_params(json.first), strip_secure_params(@a2_json))
+    expect(strip_secure_params(json.first)).to eq strip_secure_params(@a2_json)
   end
 
   it "should ignore excused assignments for students" do

spec/lib/services/notification_service_spec.rb

@@ -129,7 +129,7 @@ def send_message(message_body: , queue_url: )
           NotificationService.stubs(:notification_queue).returns(spy)
 
           NotificationService.process(1, 'hello', 'email', 'alice@example.com')
-          compare_json(expected, spy.sent_hash)
+          expect(expected).to eq spy.sent_hash
         end
       end
     end

spec/spec_helper.rb

@@ -765,25 +765,6 @@ def content_type_key
     'Content-Type'
   end
 
-  def compare_json(actual, expected)
-    if actual.is_a?(Hash)
-      actual.each do |k, v|
-        expected_v = expected[k]
-        compare_json(v, expected_v)
-      end
-    elsif actual.is_a?(Array)
-      actual.zip(expected).each do |a, e|
-        compare_json(a, e)
-      end
-    else
-      if actual.is_a?(Integer) || actual.is_a?(Float)
-        expect(actual).to eq expected
-      else
-        expect(actual.to_json).to eq expected.to_json
-      end
-    end
-  end
-
   class FakeHttpResponse
     def initialize(code, body = nil, headers={})
       @code = code