Commit 0ac65b6c authored by Rémy Coutable's avatar Rémy Coutable

Don't override presentee methods for Gitlab::View::Presenter::Delegated

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent b60de9c0
...@@ -94,7 +94,7 @@ class Projects::BuildsController < Projects::ApplicationController ...@@ -94,7 +94,7 @@ class Projects::BuildsController < Projects::ApplicationController
private private
def build def build
@build ||= project.builds.find_by!(id: params[:id]).present(user: current_user) @build ||= project.builds.find_by!(id: params[:id]).present(current_user: current_user)
end end
def build_path(build) def build_path(build)
......
...@@ -113,7 +113,7 @@ detects the presenter based on the presented subject's class. ...@@ -113,7 +113,7 @@ detects the presenter based on the presented subject's class.
class Projects::LabelsController < Projects::ApplicationController class Projects::LabelsController < Projects::ApplicationController
def edit def edit
@label = Gitlab::View::Presenter::Factory @label = Gitlab::View::Presenter::Factory
.new(@label, user: current_user) .new(@label, current_user: current_user)
.fabricate! .fabricate!
end end
end end
...@@ -132,7 +132,7 @@ and then in the controller: ...@@ -132,7 +132,7 @@ and then in the controller:
```ruby ```ruby
class Projects::LabelsController < Projects::ApplicationController class Projects::LabelsController < Projects::ApplicationController
def edit def edit
@label = @label.present(user: current_user) @label = @label.present(current_user: current_user)
end end
end end
``` ```
...@@ -147,7 +147,7 @@ end ...@@ -147,7 +147,7 @@ end
You can also present the model in the view: You can also present the model in the view:
```ruby ```ruby
- label = @label.present(current_user) - label = @label.present(current_user: current_user)
%div{ class: label.text_color } %div{ class: label.text_color }
= render partial: label, label: label = render partial: label, label: label
......
...@@ -8,7 +8,9 @@ module Gitlab ...@@ -8,7 +8,9 @@ module Gitlab
@subject = subject @subject = subject
attributes.each do |key, value| attributes.each do |key, value|
define_singleton_method(key) { value } unless subject.respond_to?(key)
define_singleton_method(key) { value }
end
end end
super(subject) super(subject)
......
require 'spec_helper' require 'spec_helper'
describe Gitlab::View::Presenter::Delegated do describe Gitlab::View::Presenter::Delegated do
let(:project) { double(:project, bar: 'baz') } let(:project) { double(:project, user: 'John Doe') }
let(:presenter_class) do let(:presenter_class) do
Class.new(described_class) Class.new(described_class)
end end
...@@ -12,10 +12,15 @@ describe Gitlab::View::Presenter::Delegated do ...@@ -12,10 +12,15 @@ describe Gitlab::View::Presenter::Delegated do
describe '#initialize' do describe '#initialize' do
it 'takes arbitrary key/values and exposes them' do it 'takes arbitrary key/values and exposes them' do
presenter = presenter_class.new(project, user: 'user', foo: 'bar') presenter = presenter_class.new(project, current_user: 'Jane Doe')
expect(presenter.user).to eq('user') expect(presenter.current_user).to eq('Jane Doe')
expect(presenter.foo).to eq('bar') end
it 'does not override the presentee attributes' do
presenter = presenter_class.new(project, user: 'Jane Doe')
expect(presenter.user).to eq('John Doe')
end end
end end
...@@ -23,7 +28,7 @@ describe Gitlab::View::Presenter::Delegated do ...@@ -23,7 +28,7 @@ describe Gitlab::View::Presenter::Delegated do
it 'forwards missing methods to subject' do it 'forwards missing methods to subject' do
presenter = presenter_class.new(project) presenter = presenter_class.new(project)
expect(presenter.bar).to eq('baz') expect(presenter.user).to eq('John Doe')
end end
end end
end end
...@@ -22,13 +22,6 @@ describe Gitlab::View::Presenter::Factory do ...@@ -22,13 +22,6 @@ describe Gitlab::View::Presenter::Factory do
end end
describe '#fabricate!' do describe '#fabricate!' do
it 'exposes given params' do
presenter = described_class.new(build, user: 'user', foo: 'bar').fabricate!
expect(presenter.user).to eq('user')
expect(presenter.foo).to eq('bar')
end
it 'detects the presenter based on the given subject' do it 'detects the presenter based on the given subject' do
presenter = described_class.new(build).fabricate! presenter = described_class.new(build).fabricate!
......
require 'spec_helper' require 'spec_helper'
describe Gitlab::View::Presenter::Simple do describe Gitlab::View::Presenter::Simple do
let(:project) { double(:project) } let(:project) { double(:project, user: 'John Doe') }
let(:presenter_class) do let(:presenter_class) do
Class.new(described_class) Class.new(described_class)
end end
...@@ -12,10 +12,15 @@ describe Gitlab::View::Presenter::Simple do ...@@ -12,10 +12,15 @@ describe Gitlab::View::Presenter::Simple do
describe '#initialize' do describe '#initialize' do
it 'takes arbitrary key/values and exposes them' do it 'takes arbitrary key/values and exposes them' do
presenter = presenter_class.new(project, user: 'user', foo: 'bar') presenter = presenter_class.new(project, current_user: 'Jane Doe')
expect(presenter.user).to eq('user') expect(presenter.current_user).to eq('Jane Doe')
expect(presenter.foo).to eq('bar') end
it 'override the presentee attributes' do
presenter = presenter_class.new(project, user: 'Jane Doe')
expect(presenter.user).to eq('Jane Doe')
end end
end end
...@@ -23,7 +28,7 @@ describe Gitlab::View::Presenter::Simple do ...@@ -23,7 +28,7 @@ describe Gitlab::View::Presenter::Simple do
it 'does not forward missing methods to subject' do it 'does not forward missing methods to subject' do
presenter = presenter_class.new(project) presenter = presenter_class.new(project)
expect { presenter.foo }.to raise_error(NoMethodError) expect { presenter.user }.to raise_error(NoMethodError)
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment