Merge pull request #422 from BRIMIL01/test_cleanup

Test cleanup

Author: apex-omontgomery

app/lib/git_hub/client.rb

@@ -118,7 +118,7 @@ def check_rate_limit(response)
     def reset_time(response)
       seconds = response.headers['X-RateLimit-Reset'].to_i
 
-      Time.at(seconds).strftime '%-m/%d/%Y at%l:%M:%S%P %Z'
+      Time.at(seconds).utc.strftime '%-m/%d/%Y at%l:%M:%S%P %Z'
     end
   end
 end

test/controllers/api/v1/airtable/mentorships_controller_test.rb

@@ -10,16 +10,16 @@ class Api::V1::Airtable::MentorshipsControllerTest < ActionDispatch::Integration
     VCR.use_cassette('airtable/mentorship/successful') do
       get api_v1_airtable_mentorships_path, headers: @headers, as: :json
 
-      assert response.status == 200
-      assert response.parsed_body.keys.sort == ['mentors', 'services', 'skillsets']
+      assert_equal 200, response.status
+      assert_equal ['mentors', 'services', 'skillsets'], response.parsed_body.keys.sort
     end
   end
 
   test ':index when rate limit returns a 422 and error message' do
     VCR.use_cassette('airtable/mentorship/exceeded_rate_limit') do
       get api_v1_airtable_mentorships_path, headers: @headers, as: :json
 
-      assert response.status == 422
+      assert_equal 422, response.status
       assert response.parsed_body['error'].present?
     end
   end
@@ -42,7 +42,7 @@ class Api::V1::Airtable::MentorshipsControllerTest < ActionDispatch::Integration
         as: :json
       )
 
-      assert response.status == 201
+      assert_equal 201, response.status
       assert response.parsed_body['id'].present?
       assert response.parsed_body['createdTime'].present?
     end
@@ -66,7 +66,7 @@ class Api::V1::Airtable::MentorshipsControllerTest < ActionDispatch::Integration
         as: :json
       )
 
-      assert response.status == 201
+      assert_equal 201, response.status
       assert response.parsed_body['id'].present?
       assert response.parsed_body['createdTime'].present?
     end

test/controllers/api/v1/code_schools_controller_test.rb

@@ -64,11 +64,11 @@ class Api::V1::CodeSchoolsControllerTest < ActionDispatch::IntegrationTest
     dojo = code_schools[0]
     wynode = code_schools[1]
 
-    assert dojo['name'] == coding_dojo.name
-    assert wynode['name'] == wynode_academy.name
+    assert_equal dojo['name'], coding_dojo.name
+    assert_equal wynode['name'], wynode_academy.name
 
-    assert cities_for(dojo) == [dojo_la.city, dojo_san_fran.city]
-    assert cities_for(wynode) == [wynode_denver.city, wynode_dallas.city]
+    assert_equal cities_for(dojo), [dojo_la.city, dojo_san_fran.city]
+    assert_equal cities_for(wynode), [wynode_denver.city, wynode_dallas.city]
   end
 
   test ':create endpoint creates a CodeSchool successfully' do

test/controllers/api/v1/slack_users_controller_test.rb

@@ -10,8 +10,8 @@ class Api::V1::SlackUsersControllerTest < ActionDispatch::IntegrationTest
 
     body = JSON.parse(response.body)
 
-    assert response.status == 200
-    assert body == { 'message' => 'You have access!' }
+    assert_equal response.status, 200
+    assert_equal body, { 'message' => 'You have access!' }
   end
 
   test ':access returns a 401 with an incorrect token' do
@@ -23,8 +23,8 @@ class Api::V1::SlackUsersControllerTest < ActionDispatch::IntegrationTest
 
     body = JSON.parse(response.body)
 
-    assert response.status == 401
-    assert body == { 'errors' => ['Auth token is invalid'] }
+    assert_equal response.status, 401
+    assert_equal body, { 'errors' => ['Auth token is invalid'] }
   end
 
   test ':access returns a 401 with an expired token' do
@@ -36,8 +36,8 @@ class Api::V1::SlackUsersControllerTest < ActionDispatch::IntegrationTest
 
     body = JSON.parse(response.body)
 
-    assert response.status == 401
-    assert body == { 'errors' => ['Auth token has expired'] }
+    assert_equal response.status, 401
+    assert_equal body, { 'errors' => ['Auth token has expired'] }
   end
 
   test ':access returns a 401 with a malformed token' do
@@ -49,8 +49,8 @@ class Api::V1::SlackUsersControllerTest < ActionDispatch::IntegrationTest
 
     body = JSON.parse(response.body)
 
-    assert response.status == 401
-    assert body == { 'errors' => ['Invalid auth token'] }
+    assert_equal response.status, 401
+    assert_equal body, { 'errors' => ['Invalid auth token'] }
   end
 end
 

test/lib/git_hub/authentication_test.rb

@@ -21,48 +21,46 @@ class GitHub::AuthenticationTest < ActiveSupport::TestCase
   end
 
   test 'initialize constructs the expected variable' do
-    assert @instance.options == @options
-    assert @instance.auth_level == GitHub::Authentication::O_AUTH_2_KEY_SECRET
+    assert_equal @options, @instance.options
+    assert_equal GitHub::Authentication::O_AUTH_2_KEY_SECRET, @instance.auth_level
   end
 
   test '#set_options returns the passed in options when Rails.env.prod? is false' do
-    assert @instance.set_options == @options
+    assert @options, @instance.set_options
   end
 
   test '#set_options merges the authenticated OAUTH_KEY options hash when Rails.env.prod? is true' do
     Rails.env.stubs(:prod?).returns(true)
 
-    assert @instance.set_options == {
-      :query =>
-        {
-          :client_id => 'some random id',
-          :client_secret => 'some random key',
-          :per_page => 100
-        },
-      :headers =>
-        {
-          'Accepts' => 'application/vnd.github.v3+json',
-          'User-Agent' => 'operationcode'
-        }
-      }
+    assert_equal @instance.set_options,
+                 :query =>
+                   {
+                     :client_id => 'some random id',
+                     :client_secret => 'some random key',
+                     :per_page => 100
+                   },
+                 :headers =>
+                   {
+                     'Accepts' => 'application/vnd.github.v3+json',
+                     'User-Agent' => 'operationcode'
+                   }
   end
 
   test '#set_options merges the authenticated OAUTH_TOKEN options hash when Rails.env.prod? is true' do
     GitHub::Settings.stubs(:authentication_level).returns(GitHub::Authentication::O_AUTH_2_TOKEN)
     Rails.env.stubs(:prod?).returns(true)
 
     instance = GitHub::Authentication.new(@options)
-    assert instance.set_options == {
-      :query =>
-        {
-          :per_page => 100
-        },
-      :headers =>
-        {
-          'Accepts' => 'application/vnd.github.v3+json',
-          'User-Agent' => 'operationcode',
-          'Authorization' => "Bearer #{GitHub::Settings.o_auth_2_token}"
-        }
-      }
+    assert_equal instance.set_options,
+                 :query =>
+                   {
+                     :per_page => 100
+                   },
+                 :headers =>
+                   {
+                     'Accepts' => 'application/vnd.github.v3+json',
+                     'User-Agent' => 'operationcode',
+                     'Authorization' => "Bearer #{GitHub::Settings.o_auth_2_token}"
+                   }
   end
 end

test/lib/git_hub/committer_test.rb

@@ -32,14 +32,14 @@ class GitHub::CommitterTest < ActiveSupport::TestCase
 
     user = GitHub::Committer.find_or_create_user! @user_attrs
 
-    assert GitHubUser.first == user
+    assert_equal user, GitHubUser.first
   end
 
   test '.find_or_create_user! returns the existing matched user' do
     user    = create :git_hub_user, git_hub_login: @user_attrs[:login]
     results = GitHub::Committer.find_or_create_user! @user_attrs.merge(id: user.git_hub_id)
 
-    assert results == user
+    assert_equal user, results
   end
 
   test '.find_or_create_statistic! creates and returns non-existing GitHubStatistic' do
@@ -51,7 +51,7 @@ class GitHub::CommitterTest < ActiveSupport::TestCase
       create(:git_hub_user).id
     )
 
-    assert GitHubStatistic.first == stat
+    assert_equal stat, GitHubStatistic.first
   end
 
   test '.find_or_create_statistic! returns the existing matched user' do
@@ -68,6 +68,6 @@ class GitHub::CommitterTest < ActiveSupport::TestCase
       user.git_hub_id
     )
 
-    assert results == stat
+    assert_equal stat, results
   end
 end

test/lib/send_grid_client/guest_test.rb

@@ -10,24 +10,23 @@ class SendGridClient::GuestTest < ActiveSupport::TestCase
   test "#user creates an :id method that defaults to 'guest-id'" do
     guest = SendGridClient::Guest.user(valid_email)
 
-    assert guest.id == 'guest-id'
+    assert 'guest-id', guest.id
   end
 
   test '#user creates an :email method that is set to the passed email address' do
     guest = SendGridClient::Guest.user(valid_email)
 
-    assert guest.email == valid_email
+    assert_equal valid_email, guest.email
   end
 
   test "#attributes returns JSON for the Struct's id, first_name, last_name, and email" do
     guest = SendGridClient::Guest.user(valid_email)
 
-    assert guest.attributes == {
-      'id' => 'guest-id',
-      'email' => valid_email,
-      'first_name' => '',
-      'last_name' => ''
-    }
+    assert_equal guest.attributes,
+                 'id' => 'guest-id',
+                 'email' => valid_email,
+                 'first_name' => '',
+                 'last_name' => ''
   end
 end
 

test/models/code_schools_test.rb

@@ -6,7 +6,7 @@ def setup
   end
 
   test 'is_partner should be present and default to false' do
-    assert @code_school.is_partner == false
+    assert_not @code_school.is_partner
   end
 
   test 'rep_name should be present' do

test/models/user_test.rb

@@ -45,7 +45,7 @@ def teardown
 
     some_role = create :role
     user.update! role_id: some_role.id
-    assert user.role == some_role
+    assert_equal some_role, user.role
   end
 
   test 'doesnt geocode until we validate' do
@@ -75,11 +75,11 @@ def teardown
   test 'validates the presence of a zip' do
     user = build :user, zip: nil
     refute user.valid?
-    assert user.errors.full_messages == ["Zip can't be blank"]
+    assert_equal ["Zip can't be blank"], user.errors.full_messages
 
     user = build :user, zip: ''
     refute user.valid?
-    assert user.errors.full_messages == ["Zip can't be blank"]
+    assert ["Zip can't be blank"], user.errors.full_messages
   end
 
   test 'longitude and longitude are nil for unknown zipcodes' do

test/requests/airtable/mentorship_test.rb

@@ -8,7 +8,7 @@ def setup
   end
 
   def test_mentor_request_data_returns_correct_keys
-    assert @successful_response.keys.sort == %i[mentors services skillsets]
+    assert_equal %i[mentors services skillsets], @successful_response.keys.sort
   end
 
   def test_mentor_request_data_returns_correct_mentor_data
@@ -54,25 +54,25 @@ def test_create_mentor_request_creates_the_passed_mentor_request
       response = Airtable::Mentorship.new.create_mentor_request(request_body)
 
       assert response['id'].present?
-      assert response.dig('fields', 'Slack User') == request_body[:slack_user]
-      assert response.dig('fields', 'Email') == request_body[:email]
-      assert response.dig('fields', 'Service') == [request_body[:services]]
-      assert response.dig('fields', 'Skillsets') == [request_body[:skillsets]]
-      assert response.dig('fields', 'Additional Details') == request_body[:additional_details]
-      assert response.dig('fields', 'Mentor Requested') == [request_body[:mentor_requested]]
+      assert_equal request_body[:slack_user], response.dig('fields', 'Slack User')
+      assert_equal request_body[:email], response.dig('fields', 'Email')
+      assert_equal [request_body[:services]], response.dig('fields', 'Service')
+      assert_equal [request_body[:skillsets]], response.dig('fields', 'Skillsets')
+      assert_equal request_body[:additional_details], response.dig('fields', 'Additional Details')
+      assert_equal [request_body[:mentor_requested]], response.dig('fields', 'Mentor Requested')
     end
   end
 
   def test_format_for_posting_converts_comma_separated_string_into_array_of_strings
     instance = Airtable::Mentorship.new
 
     converted = instance.send(:format_for_posting, 'this , and long ')
-    assert converted == ['this', 'and long']
+    assert_equal ['this', 'and long'], converted
 
     converted = instance.send(:format_for_posting, 'this,that')
-    assert converted == ['this', 'that']
+    assert_equal ['this', 'that'], converted
 
     converted = instance.send(:format_for_posting, 'this')
-    assert converted == ['this']
+    assert_equal ['this'], converted
   end
 end