From e4045aa6aa9300622bd0006e5abb9a8ef2f29a46 Mon Sep 17 00:00:00 2001
From: Sam Harrison <sharrison@twilio.com>
Date: Wed, 15 Jul 2020 16:07:40 -0500
Subject: [PATCH 1/2] test: fix the license test and actually run the test
 scripts

---
 Makefile                                |  2 +-
 test/sendgrid/helpers/mail/test_mail.rb |  2 +-
 test/sendgrid/test_sendgrid-ruby.rb     | 17 +++++------------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index ab737933..c69e4bce 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ install:
 	gem install bundler:2.1.2; bundle install
 
 test:
-	bundle exec rake spec
+	bundle exec rake
 
 test-integ: test
 
diff --git a/test/sendgrid/helpers/mail/test_mail.rb b/test/sendgrid/helpers/mail/test_mail.rb
index 3b850c7e..6c379cb0 100644
--- a/test/sendgrid/helpers/mail/test_mail.rb
+++ b/test/sendgrid/helpers/mail/test_mail.rb
@@ -1,5 +1,5 @@
 require_relative "../../../../lib/sendgrid/helpers/mail/mail"
-require_relative "../../../../lib/sendgrid/client"
+require_relative "../../../../lib/sendgrid/sendgrid"
 include SendGrid
 require "json"
 require 'minitest/autorun'
diff --git a/test/sendgrid/test_sendgrid-ruby.rb b/test/sendgrid/test_sendgrid-ruby.rb
index ff69e568..abe60bb3 100644
--- a/test/sendgrid/test_sendgrid-ruby.rb
+++ b/test/sendgrid/test_sendgrid-ruby.rb
@@ -2652,23 +2652,16 @@ def test_whitelabel_links__link_id__subuser_post
         self.assert_equal('200', response.status_code)
     end
 
-
-    def test_license_file_correct_year_range
-        if File.exist?('./LICENSE.md')
-            # get only the first line from the license txt file
-            year_range = File.open('./LICENSE.md', &:readline).gsub(/[^\d-]/, '')
-            self.assert_equal("#{Time.now.year}", year_range)
-        end
+    def test_license_file_year
+        # Read the third line from the license file
+        year = IO.readlines('./LICENSE.md')[2].gsub(/[^\d]/, '')
+        self.assert_equal("#{Time.now.year}", year)
     end
 
     def test_docker_exists
       assert(File.file?('./Docker') || File.file?('./docker/Dockerfile'))
     end
 
-    # def test_docker_compose_exists
-    #   assert(File.file?('./docker-compose.yml') || File.file?('./docker/docker-compose.yml'))
-    # end
-
     def test_env_sample_exists
       assert(File.file?('./.env_sample'))
     end
@@ -2705,7 +2698,7 @@ def test_license_exists
       assert(File.file?('./LICENSE.md'))
     end
 
-    def test_pull_request_template_exists
+    def test_pr_template_exists
       assert(File.file?('./PULL_REQUEST_TEMPLATE.md'))
     end
 

From cb34afa33dd77d48e81cfe8e3e49353abf5eb6a9 Mon Sep 17 00:00:00 2001
From: Sam Harrison <sharrison@twilio.com>
Date: Wed, 15 Jul 2020 16:13:14 -0500
Subject: [PATCH 2/2] drop the individual example file tests

---
 test/sendgrid/test_sendgrid-ruby.rb | 40 ++++++++++-------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/test/sendgrid/test_sendgrid-ruby.rb b/test/sendgrid/test_sendgrid-ruby.rb
index 7a6505f9..5e649495 100644
--- a/test/sendgrid/test_sendgrid-ruby.rb
+++ b/test/sendgrid/test_sendgrid-ruby.rb
@@ -2659,74 +2659,62 @@ def test_license_file_year
     end
 
     def test_docker_exists
-      assert(File.file?('./Docker') || File.file?('./docker/Dockerfile'))
+        assert(File.file?('./Docker') || File.file?('./docker/Dockerfile'))
     end
 
     def test_env_sample_exists
-      assert(File.file?('./.env_sample'))
+        assert(File.file?('./.env_sample'))
     end
 
     def test_gitignore_exists
-      assert(File.file?('./.gitignore'))
+        assert(File.file?('./.gitignore'))
     end
 
     def test_travis_exists
-      assert(File.file?('./.travis.yml'))
+        assert(File.file?('./.travis.yml'))
     end
 
     def test_codeclimate_exists
-      assert(File.file?('./.codeclimate.yml'))
+        assert(File.file?('./.codeclimate.yml'))
     end
 
     def test_changelog_exists
-      assert(File.file?('./CHANGELOG.md'))
+        assert(File.file?('./CHANGELOG.md'))
     end
 
     def test_code_of_conduct_exists
-      assert(File.file?('./CODE_OF_CONDUCT.md'))
+        assert(File.file?('./CODE_OF_CONDUCT.md'))
     end
 
     def test_contributing_exists
-      assert(File.file?('./CONTRIBUTING.md'))
+        assert(File.file?('./CONTRIBUTING.md'))
     end
 
     def test_issue_template_exists
-      assert(File.file?('./ISSUE_TEMPLATE.md'))
+        assert(File.file?('./ISSUE_TEMPLATE.md'))
     end
 
     def test_license_exists
-      assert(File.file?('./LICENSE.md'))
+        assert(File.file?('./LICENSE.md'))
     end
 
     def test_pr_template_exists
-      assert(File.file?('./PULL_REQUEST_TEMPLATE.md'))
+        assert(File.file?('./PULL_REQUEST_TEMPLATE.md'))
     end
 
     def test_readme_exists
-      assert(File.file?('./README.md'))
+        assert(File.file?('./README.md'))
     end
 
     def test_troubleshooting_exists
-      assert(File.file?('./TROUBLESHOOTING.md'))
+        assert(File.file?('./TROUBLESHOOTING.md'))
     end
 
     def test_usage_exists
-      assert(File.file?('./USAGE.md'))
-    end
-
-    def test_use_cases_domain_whitelabel_exists
-        assert(File.file?('./use-cases/domain-whitelabel.md'))
-    end
-
-    def test_use_cases_email_statistics_exists
-        assert(File.file?('./use-cases/email-statistics.md'))
+        assert(File.file?('./USAGE.md'))
     end
 
     def test_use_cases_readme_exists
         assert(File.file?('./use-cases/README.md'))
     end
-
-    def test_use_cases_transactional_templates_exists
-        assert(File.file?('./use-cases/transactional-templates.md'))
-    end
 end