Merge branch '0-10-stable' into 0-10-stable

Author: f3z0

.github/workflows/ci.yml

@@ -0,0 +1,69 @@
+---
+
+name: CI
+
+on:
+  - "push"
+
+jobs:
+  test:
+    name: "Testing"
+    runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # Recent Rubies and Rails
+          - ruby-version: '2.6'
+            rails-version: '6.1'
+          - ruby-version: '2.6'
+            rails-version: '6.0'
+          - ruby-version: '2.7'
+            rails-version: '6.0'
+          - ruby-version: '2.6'
+            rails-version: '5.2'
+          # Old Rubies and Rails
+          - ruby-version: '2.5'
+            rails-version: '5.1'
+            bundler: '1'
+          - ruby-version: '2.4'
+            rails-version: '5.0'
+            bundler: '1'
+          - ruby-version: '2.4'
+            rails-version: '4.2'
+            bundler: '1'
+          # Failing with a stack trace in active support
+          # - ruby-version: '2.4'
+          #   rails-version: '4.1'
+          #   bundler: '1'
+
+    continue-on-error: "${{ endsWith(matrix.ruby-version, 'head') }}"
+
+    env:
+      CI: "1"
+
+    steps:
+      - name:                     "Checkout Code"
+        uses:                     "actions/checkout@v2"
+        timeout-minutes:          5
+        with:
+          fetch-depth:            0
+
+      - name: Install required libs
+        run: |
+          sudo apt-get -yqq install libsqlite3-dev
+
+      - name: "Build Ruby"
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version:   "${{ matrix.ruby-version }}"
+          bundler:        "${{ matrix.bundler || 2 }}"
+          bundler-cache:  true
+        env:
+          RAILS_VERSION: ${{ matrix.rails-version }}
+
+      - name: "Run tests"
+        run: |
+          bundle exec rake
+        env:
+          RAILS_VERSION: ${{ matrix.rails-version }}

.simplecov

@@ -13,7 +13,6 @@
     <td>
       <a href="https://codeclimate.com/github/rails-api/active_model_serializers"><img src="https://codeclimate.com/github/rails-api/active_model_serializers/badges/gpa.svg" alt="Code Quality"></a>
       <a href="https://codebeat.co/projects/mygithub.libinneed.workers.dev-rails-api-active_model_serializers"><img src="https://codebeat.co/badges/a9ab35fa-8b5a-4680-9d4e-a81f9a55ebcd" alt="codebeat" ></a>
-      <a href="https://codeclimate.com/github/rails-api/active_model_serializers/coverage"><img src="https://codeclimate.com/github/rails-api/active_model_serializers/badges/coverage.svg" alt="Test Coverage"></a>
     </td>
   </tr>
   <tr>

README.md

@@ -5,10 +5,6 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'simplecov'
-rescue LoadError # rubocop:disable Lint/HandleExceptions
-end
 import('lib/tasks/rubocop.rake')
 
 Bundler::GemHelper.install_tasks
@@ -56,13 +52,20 @@ namespace :test do
     # https://github.com/rails/rails/blob/3d590add45/railties/lib/rails/generators/app_base.rb#L345-L363
     _bundle_command = Gem.bin_path('bundler', 'bundle')
     require 'bundler'
-    Bundler.with_clean_env do
+    with_clean_env = proc do
       isolated_test_files.all? do |test_file|
         command = "-w -I#{dir}/lib -I#{dir}/test #{Shellwords.shellescape(test_file)}"
         full_command = %("#{Gem.ruby}" #{command})
         system(full_command)
       end or fail 'Failures' # rubocop:disable Style/AndOr
     end
+    bundler_method =
+      if Bundler.method_defined?(:with_unbundled_env)
+        :with_unbundled_env
+      else
+        :with_clean_env
+      end
+    Bundler.public_send(bundler_method, &with_clean_env)
   end
 end
 

Rakefile

@@ -55,9 +55,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'will_paginate', '~> 3.0', '>= 3.0.7'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'simplecov', '>= 0.11'
   spec.add_development_dependency 'timecop', '~> 0.7'
-  spec.add_development_dependency 'grape', ['>= 0.13', '< 0.19.1']
+  spec.add_development_dependency 'grape', '>= 0.13'
   spec.add_development_dependency 'json_schema'
-  spec.add_development_dependency 'rake', ['>= 10.0', '< 13.0']
+  spec.add_development_dependency 'rake', '>= 10.0'
 end

active_model_serializers.gemspec

@@ -18,8 +18,6 @@
 
 - [Improve code quality](https://codeclimate.com/github/rails-api/active_model_serializers/code?sort=smell_count&sort_direction=desc).
 
-- [Improve amount of code exercised by tests](https://codeclimate.com/github/rails-api/active_model_serializers/coverage?sort=covered_percent&sort_direction=asc).
-
 - [Fix RuboCop (Style) TODOS](https://github.com/rails-api/active_model_serializers/blob/master/.rubocop_todo.yml).
   - Delete and offsense, run `rake rubocop` (or possibly `rake rubocop:auto_correct`),
     and [submit a PR](CONTRIBUTING.md#submitting-a-pull-request-pr).

docs/STYLE.md

@@ -71,13 +71,13 @@ def render_using_explicit_each_serializer
       def test_render_using_explicit_serializer
         get :render_using_explicit_serializer
 
-        assert_equal 'application/json', @response.content_type
+        assert_match(%r{\Aapplication/json}, @response.content_type)
         assert_equal '{"name":"Name 1"}', @response.body
       end
 
       def test_render_array_using_explicit_serializer
         get :render_array_using_explicit_serializer
-        assert_equal 'application/json', @response.content_type
+        assert_match(%r{\Aapplication/json}, @response.content_type)
 
         expected = [
           { 'name' => 'Name 1' },
@@ -89,7 +89,7 @@ def test_render_array_using_explicit_serializer
 
       def test_render_array_using_implicit_serializer
         get :render_array_using_implicit_serializer
-        assert_equal 'application/json', @response.content_type
+        assert_match(%r{\Aapplication/json}, @response.content_type)
 
         expected = [
           { 'name' => 'Name 1' },