kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix Override. Properly define prepended

Browse source 
We should never be sloppy!
This commit is contained in:
Lin Jen-Shin 2018-08-30 19:51:32 +08:00
parent 71fefe1474
commit 517ee9fd04
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/gitlab/utils/override.rb
View file

@ -92,9 +92,13 @@ module Gitlab
queue_verification(base)
end
alias_method :prepended, :included
def prepended(base = nil)
super
def extended(mod)
queue_verification(base)
end
def extended(mod = nil)
super
queue_verification(mod.singleton_class)

10
spec/lib/gitlab/patch/prependable_spec.rb
View file

@ -23,7 +23,7 @@ describe Gitlab::Patch::Prependable do
this = self
prepended do
prepended_modules_ << this
prepended_modules_ << [self, this]
end
def name
@ -48,7 +48,7 @@ describe Gitlab::Patch::Prependable do
this = self
prepended do
prepended_modules_ << this
prepended_modules_ << [self, this]
end
def name
@ -71,7 +71,7 @@ describe Gitlab::Patch::Prependable do
subject
expect(prepended_modules).to eq([ee, ce])
expect(prepended_modules).to eq([[subject, ee], [subject, ce]])
end
end
@ -86,7 +86,7 @@ describe Gitlab::Patch::Prependable do
it 'prepends only once' do
subject.prepend(ce)
expect(prepended_modules).to eq([ee, ce])
expect(prepended_modules).to eq([[subject, ee], [subject, ce]])
end
end
@ -115,7 +115,7 @@ describe Gitlab::Patch::Prependable do
it 'prepends only once' do
subject.prepend(ee)
expect(prepended_modules).to eq([ee])
expect(prepended_modules).to eq([[subject, ee]])
end
end
end