File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -116,28 +116,22 @@ def loaded
116116 @loaded
117117 end
118118
119- def non_thread_safe_loaded
119+ def non_thread_safe_loaded # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
120120 return @loaded if @already_loaded
121121
122122 check_arguments!
123123
124124 @loaded = { }
125- perform_loading
126- @already_loaded = true
127- @loaded
128- end
129125
130- def perform_loading
131126 if respond_to? ( :single ) && elements . size == 1
132127 fulfill ( elements . first , single ( elements . first ) )
133128 elsif elements . any?
134- bind_elements_context
129+ elements . each { | el | el . n1_bind_to ( elements ) if el . respond_to? ( :n1_bind_to ) }
135130 perform ( elements )
136131 end
137- end
138132
139- def bind_elements_context
140- elements . each { | el | el . n1_bind_to ( elements ) if el . respond_to? ( :n1_bind_to ) }
133+ @already_loaded = true
134+ @loaded
141135 end
142136 end
143137end
Original file line number Diff line number Diff line change @@ -514,7 +514,7 @@ def count(loader)
514514 nested_objects . first . first_loader
515515
516516 nested_objects . first . second_loader
517- expect { nested_objects . last . second_loader } . not_to ( change { nested_klass . count ( :second_loader ) } )
517+ expect { nested_objects . last . second_loader } . not_to change { nested_klass . count ( :second_loader ) } # rubocop:disable Lint/AmbiguousBlockAssociation
518518 end
519519
520520 it "auto-binds single element to a collection containing only itself" do
@@ -525,7 +525,7 @@ def count(loader)
525525
526526 # Accessing second_loader on the single element should still work correctly
527527 expect { single . second_loader } . to change { nested_klass . count ( :second_loader ) } . by ( 1 )
528- expect { single . second_loader } . not_to ( change { nested_klass . count ( :second_loader ) } )
528+ expect { single . second_loader } . not_to change { nested_klass . count ( :second_loader ) } # rubocop:disable Lint/AmbiguousBlockAssociation
529529 end
530530 end
531531end
You can’t perform that action at this time.
0 commit comments