Skip to content

Commit

Permalink
Fix rubocop offenses.
Browse files Browse the repository at this point in the history
  • Loading branch information
semenovDL committed Jul 12, 2016
1 parent 9e7715a commit d324f82
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 4 additions & 2 deletions lib/rails_admin/config/lazy_model.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@ def target
# blocks defined within a model class.
unless @deferred_blocks.empty?
@existing_blocks += @deferred_blocks
@existing_blocks.partition { |block| block.source_location.first =~ /config\/initializers/ }
.flatten.each { |block| @model.instance_eval(&block) }
@existing_blocks.
partition { |block| block.source_location.first =~ %r{config\/initializers} }.
flatten.
each { |block| @model.instance_eval(&block) }
@deferred_blocks = []
end
@model
Expand Down
3 changes: 1 addition & 2 deletions spec/rails_admin/config_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,7 @@ class RecursivelyEmbedsMany
context 'when model expanded in config' do
let(:block) { proc { field :players } }
before do
allow(block).to receive(:source_location)
.and_return(['config/initializers/rails_admin.rb'])
allow(block).to receive(:source_location).and_return(['config/initializers/rails_admin.rb'])
described_class.model(Team, &block)
end
it 'executes first' do
Expand Down

0 comments on commit d324f82

Please sign in to comment.