diff options
| author | Luc Donnet | 2017-09-19 12:16:34 +0200 | 
|---|---|---|
| committer | GitHub | 2017-09-19 12:16:34 +0200 | 
| commit | a6e965dd9365d629b3ae1209b8bba89281f4987c (patch) | |
| tree | 116c71f459bea6ea202886f19d180bc6981926e9 | |
| parent | 8baf33bc7e46d57dbfbe7eab9848ef0adb38465c (diff) | |
| parent | aef499baf14d5520e7de29ec0d3015f42bf37ffa (diff) | |
| download | chouette-core-a6e965dd9365d629b3ae1209b8bba89281f4987c.tar.bz2 | |
Merge pull request #69 from af83/4431-permission-renaming
Fixes: #4431@0.16666666666666666h;
| -rw-r--r-- | app/policies/login_policy.rb | 2 | ||||
| -rw-r--r-- | lib/stif/permission_translator.rb | 4 | ||||
| -rw-r--r-- | spec/controllers/devise/cas_sessions_controller_spec.rb | 6 | ||||
| -rw-r--r-- | spec/lib/stif/permission_translator_spec.rb | 6 | ||||
| -rw-r--r-- | spec/support/permissions.rb | 2 | 
5 files changed, 10 insertions, 10 deletions
| diff --git a/app/policies/login_policy.rb b/app/policies/login_policy.rb index 5b07b97f3..0360880bd 100644 --- a/app/policies/login_policy.rb +++ b/app/policies/login_policy.rb @@ -7,7 +7,7 @@ class LoginPolicy    end    def boiv? -    (user.permissions || []).include?('sessions:create') +    (user.permissions || []).include?('sessions.create')    end  end diff --git a/lib/stif/permission_translator.rb b/lib/stif/permission_translator.rb index fbd03a820..d836dd037 100644 --- a/lib/stif/permission_translator.rb +++ b/lib/stif/permission_translator.rb @@ -38,8 +38,8 @@ module Stif      def translation_table        { -        "boiv:read-offer" => %w{sessions:create}, -        "boiv:edit-offer" => all_destructive_permissions + %w{sessions:create}, +        "boiv:read-offer" => %w{sessions.create}, +        "boiv:edit-offer" => all_destructive_permissions + %w{sessions.create},        }      end    end diff --git a/spec/controllers/devise/cas_sessions_controller_spec.rb b/spec/controllers/devise/cas_sessions_controller_spec.rb index c82fd2cdb..e4436f6c1 100644 --- a/spec/controllers/devise/cas_sessions_controller_spec.rb +++ b/spec/controllers/devise/cas_sessions_controller_spec.rb @@ -17,7 +17,7 @@ RSpec.describe Devise::CasSessionsController, type: :controller do      end    end -  context 'user does not have permission sessions:create' do +  context 'user does not have permission sessions.create' do      let( :signed_in_user ){ build_stubbed :user }      it 'cannot login and will be redirected to the login page, with a corresponding message' do @@ -27,11 +27,11 @@ RSpec.describe Devise::CasSessionsController, type: :controller do      end    end -  context 'user does have permission sessions:create' do +  context 'user does have permission sessions.create' do      let( :signed_in_user ){ build_stubbed :allmighty_user }      it 'can login and will be redirected to the referentials page' do -      @user.permissions << 'sessions:create' +      @user.permissions << 'sessions.create'        get :service        expect(response).to redirect_to(authenticated_root_path)      end diff --git a/spec/lib/stif/permission_translator_spec.rb b/spec/lib/stif/permission_translator_spec.rb index 652dd2de2..ae1a2d1d5 100644 --- a/spec/lib/stif/permission_translator_spec.rb +++ b/spec/lib/stif/permission_translator_spec.rb @@ -6,8 +6,8 @@ RSpec.describe Stif::PermissionTranslator do    context "SSO Permission boiv:read-offer →" do -    it "sessions:create only" do -      expect( described_class.translate(%w{boiv:read-offer}) ).to eq(%w{sessions:create}) +    it "sessions.create only" do +      expect( described_class.translate(%w{boiv:read-offer}) ).to eq(%w{sessions.create})      end    end @@ -33,7 +33,7 @@ RSpec.describe Stif::PermissionTranslator do      end      it "remains at boiv:read-offer level" do -      expect( described_class.translate(%w{referentials.create boiv:read-offer calendars.delete}) ).to eq(%w{sessions:create}) +      expect( described_class.translate(%w{referentials.create boiv:read-offer calendars.delete}) ).to eq(%w{sessions.create})      end      it "does not add garbage or doubletons for boiv:edit-offer level" do diff --git a/spec/support/permissions.rb b/spec/support/permissions.rb index a28b62bf2..83de4e43f 100644 --- a/spec/support/permissions.rb +++ b/spec/support/permissions.rb @@ -2,7 +2,7 @@ module Support    module Permissions extend self      def all_permissions -      @__all_permissions__ ||= _destructive_permissions << 'sessions:create' +      @__all_permissions__ ||= _destructive_permissions << 'sessions.create'      end      private | 
