Merge branch 'master' into 4981_last_editor

3 files changed, 18 insertions, 15 deletions

diff --git a/spec/policies/company_policy_spec.rb b/spec/policies/company_policy_spec.rb
index 2d249a2be..e018902ca 100644
--- a/spec/policies/company_policy_spec.rb
+++ b/spec/policies/company_policy_spec.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 RSpec.describe CompanyPolicy, type: :policy do
 
   let( :record ){ build_stubbed :company }
@@ -24,19 +25,19 @@ RSpec.describe CompanyPolicy, type: :policy do
 
   context 'Destructive actions →' do
     permissions :create? do
-      it_behaves_like 'always forbidden', 'companies.create', archived: true
+      it_behaves_like 'permitted policy', 'companies.create'
     end
     permissions :destroy? do
-      it_behaves_like 'always forbidden', 'companies.destroy', archived: true
+      it_behaves_like 'permitted policy', 'companies.destroy'
     end
     permissions :edit? do
-      it_behaves_like 'always forbidden', 'companies.update', archived: true
+      it_behaves_like 'permitted policy', 'companies.update'
     end
     permissions :new? do
-      it_behaves_like 'always forbidden', 'companies.create', archived: true
+      it_behaves_like 'permitted policy', 'companies.create'
     end
     permissions :update? do
-      it_behaves_like 'always forbidden', 'companies.update', archived: true
+      it_behaves_like 'permitted policy', 'companies.update'
     end
   end
 end
diff --git a/spec/policies/line_policy_spec.rb b/spec/policies/line_policy_spec.rb
index 334073506..452606bcf 100644
--- a/spec/policies/line_policy_spec.rb
+++ b/spec/policies/line_policy_spec.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 RSpec.describe LinePolicy, type: :policy do
 
   let( :record ){ build_stubbed :line }
@@ -24,19 +25,19 @@ RSpec.describe LinePolicy, type: :policy do
 
   context 'Destructive actions →' do
     permissions :create? do
-      it_behaves_like 'always forbidden', 'lines.create', archived: true
+      it_behaves_like 'permitted policy', 'lines.create'
     end
     permissions :destroy? do
-      it_behaves_like 'always forbidden', 'lines.destroy', archived: true
+      it_behaves_like 'permitted policy', 'lines.destroy'
     end
     permissions :edit? do
-      it_behaves_like 'always forbidden', 'lines.update', archived: true
+      it_behaves_like 'permitted policy', 'lines.update'
     end
     permissions :new? do
-      it_behaves_like 'always forbidden', 'lines.create', archived: true
+      it_behaves_like 'permitted policy', 'lines.create'
     end
     permissions :update? do
-      it_behaves_like 'always forbidden', 'lines.update', archived: true
+      it_behaves_like 'permitted policy', 'lines.update'
     end
   end
 
diff --git a/spec/policies/stop_area_policy_spec.rb b/spec/policies/stop_area_policy_spec.rb
index 8fe59c8e3..90835d1d8 100644
--- a/spec/policies/stop_area_policy_spec.rb
+++ b/spec/policies/stop_area_policy_spec.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 RSpec.describe StopAreaPolicy, type: :policy do
 
   let( :record ){ build_stubbed :stop_area }
@@ -24,19 +25,19 @@ RSpec.describe StopAreaPolicy, type: :policy do
 
   context 'Destructive actions →' do
     permissions :create? do
-      it_behaves_like 'always forbidden', 'stop_areas.create', archived: true
+      it_behaves_like 'permitted policy', 'stop_areas.create'
     end
     permissions :destroy? do
-      it_behaves_like 'always forbidden', 'stop_areas.destroy', archived: true
+      it_behaves_like 'permitted policy', 'stop_areas.destroy'
     end
     permissions :edit? do
-      it_behaves_like 'always forbidden', 'stop_areas.update', archived: true
+      it_behaves_like 'permitted policy', 'stop_areas.update'
     end
     permissions :new? do
-      it_behaves_like 'always forbidden', 'stop_areas.create', archived: true
+      it_behaves_like 'permitted policy', 'stop_areas.create'
     end
     permissions :update? do
-      it_behaves_like 'always forbidden', 'stop_areas.update', archived: true
+      it_behaves_like 'permitted policy', 'stop_areas.update'
     end
   end
 end