Change permissions from columns to table entries (#762)

spec/controllers/admins_controller_spec.rb

@@ -398,7 +398,8 @@ describe AdminsController, type: :controller do
 
       it "should fail if a user attempts to edit a role with a higher priority than their own" do
         Role.create(name: "test1", priority: 1, provider: "greenlight")
-        new_role2 = Role.create(name: "test2", priority: 2, provider: "greenlight", can_edit_roles: true)
+        new_role2 = Role.create(name: "test2", priority: 2, provider: "greenlight")
+        new_role2.update_permission("can_edit_roles", "true")
         new_role3 = Role.create(name: "test3", priority: 3, provider: "greenlight")
         user_role = Role.find_by(name: "user", provider: "greenlight")
 
@@ -418,7 +419,8 @@ describe AdminsController, type: :controller do
 
       it "should fail if a user attempts to edit a role with a higher priority than their own" do
         Role.create(name: "test1", priority: 1, provider: "greenlight")
-        new_role2 = Role.create(name: "test2", priority: 2, provider: "greenlight", can_edit_roles: true)
+        new_role2 = Role.create(name: "test2", priority: 2, provider: "greenlight")
+        new_role2.update_permission("can_edit_roles", "true")
         new_role3 = Role.create(name: "test3", priority: 3, provider: "greenlight")
         user_role = Role.find_by(name: "user", provider: "greenlight")
 
@@ -465,7 +467,8 @@ describe AdminsController, type: :controller do
 
       it "should fail to update a role with a lower priority than the user" do
         new_role1 = Role.create(name: "test1", priority: 1, provider: "provider1")
-        new_role2 = Role.create(name: "test2", priority: 2, provider: "provider1", can_edit_roles: true)
+        new_role2 = Role.create(name: "test2", priority: 2, provider: "provider1")
+        new_role2.update_permission("can_edit_roles", "true")
         user_role = Role.find_by(name: "user", provider: "greenlight")
 
         user_role.priority = 3
@@ -483,7 +486,8 @@ describe AdminsController, type: :controller do
       end
 
       it "should fail to update if there is a duplicate name" do
-        new_role = Role.create(name: "test2", priority: 1, provider: "provider1", can_edit_roles: true)
+        new_role = Role.create(name: "test2", priority: 1, provider: "provider1")
+        new_role.update_permission("can_edit_roles", "true")
 
         @request.session[:user_id] = @admin.id
 
@@ -494,7 +498,8 @@ describe AdminsController, type: :controller do
       end
 
       it "should update role permisions" do
-        new_role = Role.create(name: "test2", priority: 1, provider: "provider1", can_edit_roles: true)
+        new_role = Role.create(name: "test2", priority: 1, provider: "provider1")
+        new_role.update_permission("can_edit_roles", "true")
 
         @request.session[:user_id] = @admin.id
 
@@ -503,10 +508,10 @@ describe AdminsController, type: :controller do
 
         new_role.reload
         expect(new_role.name).to eq("test")
-        expect(new_role.can_edit_roles).to eq(false)
+        expect(new_role.get_permission("can_edit_roles")).to eq(false)
         expect(new_role.colour).to eq("#45434")
-        expect(new_role.can_manage_users).to eq(true)
-        expect(new_role.send_promoted_email).to eq(false)
+        expect(new_role.get_permission("can_manage_users")).to eq(true)
+        expect(new_role.get_permission("send_promoted_email")).to eq(false)
         expect(response).to redirect_to admin_roles_path(selected_role: new_role.id)
       end
     end
@@ -538,7 +543,8 @@ describe AdminsController, type: :controller do
       end
 
       it "should successfully delete the role" do
-        new_role = Role.create(name: "test2", priority: 1, provider: "provider1", can_edit_roles: true)
+        new_role = Role.create(name: "test2", priority: 1, provider: "provider1")
+        new_role.update_permission("can_edit_roles", "true")
 
         @request.session[:user_id] = @admin.id
 

spec/controllers/rooms_controller_spec.rb

@@ -66,7 +66,7 @@ describe RoomsController, type: :controller do
     it "should render cant_create_rooms if user doesn't have permission to create rooms" do
       user_role = @user.highest_priority_role
 
-      user_role.can_create_rooms = false
+      user_role.update_permission("can_create_rooms", "false")
       user_role.save!
 
       @request.session[:user_id] = @user.id

spec/controllers/users_controller_spec.rb

@@ -308,7 +308,7 @@ describe UsersController, type: :controller do
 
         user_role = user.highest_priority_role
 
-        user_role.can_manage_users = true
+        user_role.update_permission("can_manage_users", "true")
 
         user_role.save!
 
@@ -331,7 +331,7 @@ describe UsersController, type: :controller do
 
         user_role = user.highest_priority_role
 
-        user_role.can_manage_users = true
+        user_role.update_permission("can_manage_users", "true")
 
         user_role.save!
 
@@ -354,7 +354,8 @@ describe UsersController, type: :controller do
 
         @request.session[:user_id] = admin.id
 
-        tmp_role1 = Role.create(name: "test1", priority: 1, provider: "greenlight", send_promoted_email: true)
+        tmp_role1 = Role.create(name: "test1", priority: 1, provider: "greenlight")
+        tmp_role1.update_permission("send_promoted_email", "true")
         tmp_role2 = Role.create(name: "test2", priority: 2, provider: "greenlight")
 
         params = random_valid_user_params
@@ -374,7 +375,8 @@ describe UsersController, type: :controller do
 
         admin.add_role :admin
 
-        tmp_role1 = Role.create(name: "test1", priority: 1, provider: "greenlight", send_demoted_email: true)
+        tmp_role1 = Role.create(name: "test1", priority: 1, provider: "greenlight")
+        tmp_role1.update_permission("send_demoted_email", "true")
         user.roles << tmp_role1
         user.save!