4 files changed, 41 insertions, 5 deletions
diff --git a/app/controllers/merges_controller.rb b/app/controllers/merges_controller.rb
index 1ce64ed58..663b6e750 100644
--- a/app/controllers/merges_controller.rb
+++ b/app/controllers/merges_controller.rb
@@ -1,5 +1,5 @@
 class MergesController < ChouetteController
-  # include PolicyChecker
+  include PolicyChecker
 
   defaults resource_class: Merge
   belongs_to :workbench
diff --git a/app/policies/merge_policy.rb b/app/policies/merge_policy.rb
index 82eb72e08..154dc63f5 100644
--- a/app/policies/merge_policy.rb
+++ b/app/policies/merge_policy.rb
@@ -8,8 +8,4 @@ class MergePolicy < ApplicationPolicy
   def create?
     user.has_permission?('merges.create')
   end
-
-  def update?
-    user.has_permission?('merges.update')
-  end
 end
diff --git a/spec/features/merges_permissions_spec.rb b/spec/features/merges_permissions_spec.rb
new file mode 100644
index 000000000..e8af3b5e8
--- /dev/null
+++ b/spec/features/merges_permissions_spec.rb
@@ -0,0 +1,31 @@
+describe "Merges", :type => :feature do
+  login_user
+
+  describe 'permissions' do
+    before do
+      allow_any_instance_of(MergePolicy).to receive(:create?).and_return permission
+      visit path
+    end
+
+    describe 'on show view' do
+      let( :path ){ workbench_output_path(referential.workbench) }
+      let(:button_text) { I18n.t('merges.actions.create') }
+
+      context 'if present → ' do
+        let( :permission ){ true }
+        it 'view shows the corresponding buttons' do
+          expected_new_url   = new_workbench_merge_path(referential.workbench)
+          expect( page ).to have_link(button_text, href: expected_new_url)
+        end
+      end
+
+      context 'if absent → ' do
+        let( :permission ){ false }
+        it 'view does not show the corresponding buttons' do
+          expect( page ).not_to have_link(button_text)
+        end
+      end
+    end
+
+  end
+end
diff --git a/spec/policies/merge_policy_spec.rb b/spec/policies/merge_policy_spec.rb
new file mode 100644
index 000000000..55d723080
--- /dev/null
+++ b/spec/policies/merge_policy_spec.rb
@@ -0,0 +1,9 @@
+RSpec.describe MergePolicy, type: :policy do
+
+  let( :record ){ build_stubbed :route }
+
+  permissions :create? do
+    it_behaves_like 'permitted policy outside referential', 'merges.create'
+  end
+
+end