Skip to content

Commit 348b345

Browse files
authored
Merge pull request #782 from cerebris/revert-779-fix_related_resources_context
Revert "Fixes missing context on show_related_resources"
2 parents 2a7ffdf + 39c857b commit 348b345

3 files changed

Lines changed: 0 additions & 35 deletions

File tree

lib/jsonapi/processor.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ def show_related_resources
148148
source_resource ||= source_klass.find_by_key(source_id, context: context, fields: fields)
149149

150150
related_resources = source_resource.public_send(relationship_type,
151-
context: context,
152151
filters: filters,
153152
sort_criteria: sort_criteria,
154153
paginator: paginator,

test/controllers/controller_test.rb

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3448,23 +3448,6 @@ def test_get_related_resources
34483448
}, json_response)
34493449
end
34503450

3451-
def test_get_related_resources_filtered
3452-
$test_user = Person.find(1)
3453-
get :get_related_resources, params: {moon_id: '1', relationship: 'craters', source: "api/v1/moons", filter: {description: 'Small crater'}}
3454-
assert_response :success
3455-
assert_hash_equals({
3456-
data: [
3457-
{
3458-
id:"A4D3",
3459-
type:"craters",
3460-
links:{self: "http://test.host/api/v1/craters/A4D3"},
3461-
attributes:{code: "A4D3", description: "Small crater"},
3462-
relationships:{moon: {links: {self: "http://test.host/api/v1/craters/A4D3/relationships/moon", related: "http://test.host/api/v1/craters/A4D3/moon"}}}
3463-
}
3464-
]
3465-
}, json_response)
3466-
end
3467-
34683451
def test_show_relationship
34693452
get :show_relationship, params: {crater_id: 'S56D', relationship: 'moon'}
34703453

test/fixtures/active_record.rb

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -662,27 +662,15 @@ class BreedsController < JSONAPI::ResourceController
662662
end
663663

664664
class PlanetsController < JSONAPI::ResourceController
665-
def context
666-
{current_user: $test_user}
667-
end
668665
end
669666

670667
class PlanetTypesController < JSONAPI::ResourceController
671-
def context
672-
{current_user: $test_user}
673-
end
674668
end
675669

676670
class MoonsController < JSONAPI::ResourceController
677-
def context
678-
{current_user: $test_user}
679-
end
680671
end
681672

682673
class CratersController < JSONAPI::ResourceController
683-
def context
684-
{current_user: $test_user}
685-
end
686674
end
687675

688676
class LikesController < JSONAPI::ResourceController
@@ -1081,11 +1069,6 @@ class CraterResource < JSONAPI::Resource
10811069

10821070
has_one :moon
10831071

1084-
filter :description, apply: -> (records, value, options) {
1085-
fail "context not set" unless options[:context][:current_user] != nil && options[:context][:current_user] == $test_user
1086-
records.where(:description => value)
1087-
}
1088-
10891072
def self.verify_key(key, context = nil)
10901073
key && String(key)
10911074
end

0 commit comments

Comments
 (0)