2 files changed, 25 insertions, 6 deletions
diff --git a/app/serializers/request_aware_entity.rb b/app/serializers/request_aware_entity.rb
index e159d750cb7..3039014aaaa 100644
--- a/app/serializers/request_aware_entity.rb
+++ b/app/serializers/request_aware_entity.rb
@@ -2,14 +2,11 @@ module RequestAwareEntity
   extend ActiveSupport::Concern
 
   included do
-    include Gitlab::Routing.url_helpers
+    include Gitlab::Routing
+    include Gitlab::Allowable
   end
 
   def request
-    @options.fetch(:request)
-  end
-
-  def can?(object, action, subject)
-    Ability.allowed?(object, action, subject)
+    options.fetch(:request)
   end
 end
diff --git a/spec/serializers/request_aware_entity_spec.rb b/spec/serializers/request_aware_entity_spec.rb
new file mode 100644
index 00000000000..ac23497fad9
--- /dev/null
+++ b/spec/serializers/request_aware_entity_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe RequestAwareEntity do
+  subject do
+    Class.new.include(described_class).new
+  end
+
+  it 'includes URL helpers' do
+    expect(subject).to respond_to(:namespace_project_path)
+  end
+
+  it 'includes method for checking abilities' do
+    expect(subject).to respond_to(:can?)
+  end
+
+  it 'fetches request from options' do
+    expect(subject).to receive(:options)
+      .and_return({request: 'some value'})
+
+    expect(subject.request).to eq 'some value'
+  end
+end