Skip to content

Commit

Permalink
Merge pull request #411 from gaorlov/gaorlov/actions-ruby-setup-update
Browse files Browse the repository at this point in the history
bumping ruby-setup action to be official version
  • Loading branch information
gaorlov authored Nov 22, 2023
2 parents 9f47275 + aee59dd commit b3f6bda
Show file tree
Hide file tree
Showing 32 changed files with 34 additions and 37 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ permissions:

jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -44,12 +44,9 @@ jobs:
- ruby: "2.7"
rails: "4.2"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
# change this to (see https://github.com/ruby/setup-ruby#versioning):
# uses: ruby/setup-ruby@v1
uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
Expand Down
2 changes: 1 addition & 1 deletion test/unit/association_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class Employee < TestResource
has_one :chief, klass: 'Employee'
end

class AssociationTest < MiniTest::Test
class AssociationTest < Minitest::Test

def test_default_properties_no_changes
stub_request(:post, 'http://example.com/accounts').
Expand Down
2 changes: 1 addition & 1 deletion test/unit/benchmark_dynamic_attributes_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'test_helper'
require 'benchmark'

class BenchmarkDynamicAttributesTest < MiniTest::Test
class BenchmarkDynamicAttributesTest < Minitest::Test
def test_can_parse_global_meta_data
stub_request(:get, "http://example.com/articles/1")
.to_return(headers: {content_type: "application/vnd.api+json"}, body: {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/coercion_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class CoercionTest < MiniTest::Test
class CoercionTest < Minitest::Test
TIME_STRING = '2015-04-28 10:45:35 -0700'

class CoercionTypes < TestResource
Expand Down
2 changes: 1 addition & 1 deletion test/unit/compound_document_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class CompoundDocumentTest < MiniTest::Test
class CompoundDocumentTest < Minitest::Test

TEST_DATA = %{
{
Expand Down
2 changes: 1 addition & 1 deletion test/unit/compound_non_included_document_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class CompoundNonIncludedDocumentTest < MiniTest::Test
class CompoundNonIncludedDocumentTest < Minitest::Test

TEST_DATA = %{
{
Expand Down
2 changes: 1 addition & 1 deletion test/unit/connection_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class CustomAdapterResource < TestResource
}
end

class ConnectionTest < MiniTest::Test
class ConnectionTest < Minitest::Test

def test_basic
assert_equal(NullConnection, CustomConnectionResource.connection_class)
Expand Down
2 changes: 1 addition & 1 deletion test/unit/creation_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class CreationTest < MiniTest::Test
class CreationTest < Minitest::Test

class CallbackTest < TestResource
include JsonApiClient::Helpers::Callbacks
Expand Down
2 changes: 1 addition & 1 deletion test/unit/custom_endpoint_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Country < TestResource

end

class CustomEndpointTest < MiniTest::Test
class CustomEndpointTest < Minitest::Test

def test_collection_get
stub_request(:get, "http://example.com/countries/autocomplete?starts_with=bel")
Expand Down
2 changes: 1 addition & 1 deletion test/unit/custom_header_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class CustomHeaderTest < MiniTest::Test
class CustomHeaderTest < Minitest::Test

class CustomHeaderResource < TestResource
end
Expand Down
2 changes: 1 addition & 1 deletion test/unit/custom_paginator_params_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class CustomPaginatorTest < MiniTest::Test
class CustomPaginatorTest < Minitest::Test

class CustomPaginator < JsonApiClient::Paginating::Paginator
self.page_param = 'pagina'
Expand Down
2 changes: 1 addition & 1 deletion test/unit/custom_paginator_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class CustomPaginatorTest < MiniTest::Test
class CustomPaginatorTest < Minitest::Test

class CustomPaginator < JsonApiClient::Paginating::Paginator
def total_entries
Expand Down
2 changes: 1 addition & 1 deletion test/unit/destroying_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class DestroyingTest < MiniTest::Test
class DestroyingTest < Minitest::Test

class CallbackTest < TestResource
include JsonApiClient::Helpers::Callbacks
Expand Down
2 changes: 1 addition & 1 deletion test/unit/editing_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class Author < TestResource
end

class EditingTest < MiniTest::Test
class EditingTest < Minitest::Test

def test_attribute_changed
stub_request(:get, "http://example.com/authors/1")
Expand Down
2 changes: 1 addition & 1 deletion test/unit/error_collector_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class ErrorCollectorTest < MiniTest::Test
class ErrorCollectorTest < Minitest::Test

def test_can_handle_no_errors
stub_request(:post, "http://example.com/articles")
Expand Down
2 changes: 1 addition & 1 deletion test/unit/errors_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class ErrorsTest < MiniTest::Test
class ErrorsTest < Minitest::Test

def test_connection_errors
stub_request(:get, "http://example.com/users")
Expand Down
2 changes: 1 addition & 1 deletion test/unit/finding_test.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'test_helper'

# This tests this Resource.find method
class FindingTest < MiniTest::Test
class FindingTest < Minitest::Test

def test_find_by_id
stub_request(:get, "http://example.com/articles/1")
Expand Down
2 changes: 1 addition & 1 deletion test/unit/implementation_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class ImplementationTest < MiniTest::Test
class ImplementationTest < Minitest::Test

def test_defaults_on_missing_fields
stub_request(:get, "http://example.com/articles")
Expand Down
2 changes: 1 addition & 1 deletion test/unit/integer_id_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Director < BaseResource

NUMERIC_ASSERTION = Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4') ? Fixnum : Integer

class IntegerIdTestAssociationTest < MiniTest::Test
class IntegerIdTestAssociationTest < Minitest::Test

def test_included_document_test_id_from_method_as_integer
stub_request(:get, 'http://example.com/movies/1?include=actor')
Expand Down
2 changes: 1 addition & 1 deletion test/unit/meta_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class MetaTest < MiniTest::Test
class MetaTest < Minitest::Test

def test_can_parse_global_meta_data
stub_request(:get, "http://example.com/articles/1")
Expand Down
2 changes: 1 addition & 1 deletion test/unit/nested_param_paginator_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class NestedParamPaginatorTest < MiniTest::Test
class NestedParamPaginatorTest < Minitest::Test

class Book < JsonApiClient::Resource
self.site = "http://example.com/"
Expand Down
2 changes: 1 addition & 1 deletion test/unit/nested_param_paginator_top_level_links_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Copied from TopLevelLinksTest and modified to have consistent
# pagination params using the new NestedParamPaginator
class NestedParamPaginatorTopLevelLinksTest < MiniTest::Test
class NestedParamPaginatorTopLevelLinksTest < Minitest::Test

def setup
@nested_param_paginator = JsonApiClient::Paginating::NestedParamPaginator
Expand Down
2 changes: 1 addition & 1 deletion test/unit/parser_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class ParserTest < MiniTest::Test
class ParserTest < Minitest::Test

def test_can_parse_single_record
stub_request(:get, "http://example.com/articles/1")
Expand Down
2 changes: 1 addition & 1 deletion test/unit/persistence_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class PersistenceTest < MiniTest::Test
class PersistenceTest < Minitest::Test

def test_standard_primary_key
user = User.new
Expand Down
2 changes: 1 addition & 1 deletion test/unit/query_builder_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class QueryBuilderTest < MiniTest::Test
class QueryBuilderTest < Minitest::Test

def test_can_filter
stub_request(:get, "http://example.com/articles")
Expand Down
2 changes: 1 addition & 1 deletion test/unit/resource_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class ResourceTest < MiniTest::Test
class ResourceTest < Minitest::Test

def test_basic
assert_equal :id, Article.primary_key
Expand Down
2 changes: 1 addition & 1 deletion test/unit/schemable_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class MultipleSchema < TestResource
properties :name, :short_name, :long_name, type: :string
end

class SchemableTest < MiniTest::Test
class SchemableTest < Minitest::Test

def test_default_attributes
resource = SchemaResource.new
Expand Down
2 changes: 1 addition & 1 deletion test/unit/serializing_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class SerializingTest < MiniTest::Test
class SerializingTest < Minitest::Test

class LimitedField < TestResource
self.read_only_attributes += ['foo']
Expand Down
2 changes: 1 addition & 1 deletion test/unit/server_side_error_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class ServerSideErrorTest < MiniTest::Test
class ServerSideErrorTest < Minitest::Test

def test_can_handle_validations
stub_request(:post, "http://example.com/users")
Expand Down
2 changes: 1 addition & 1 deletion test/unit/status_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class StatusTest < MiniTest::Test
class StatusTest < Minitest::Test

def test_server_responding_with_status_meta
stub_request(:get, "http://example.com/users/1")
Expand Down
2 changes: 1 addition & 1 deletion test/unit/top_level_links_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class TopLevelLinksTest < MiniTest::Test
class TopLevelLinksTest < Minitest::Test

def test_can_parse_global_links
stub_request(:get, "http://example.com/articles/1")
Expand Down
2 changes: 1 addition & 1 deletion test/unit/updating_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class UpdatingTest < MiniTest::Test
class UpdatingTest < Minitest::Test

class Author < TestResource
def relationships_for_serialization
Expand Down

0 comments on commit b3f6bda

Please sign in to comment.