Remove video_permissions Role Reference From Specs and Code (#8344)

This commit is contained in:
Molly Struve 2020-06-08 10:23:53 -05:00 committed by GitHub
parent 70ba4eba2f
commit dd1cfd33e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 11 deletions

View file

@ -12,7 +12,6 @@ class Role < ApplicationRecord
mod_relations_admin
tech_admin
trusted
video_permission
warned
workshop_pass
].freeze

View file

@ -25,7 +25,6 @@ module Moderator
end
def remove_privileges
@user.remove_role :video_permission
@user.remove_role :workshop_pass
@user.remove_role :pro
remove_mod_roles

View file

@ -73,10 +73,6 @@ FactoryBot.define do
after(:build) { |user| user.add_role(:banned) }
end
trait :video_permission do
after(:build) { |user| user.created_at = 3.weeks.ago }
end
trait :ignore_mailchimp_subscribe_callback do
after(:build) do |user|
user.define_singleton_method(:subscribe_to_mailchimp_newsletter) {}

View file

@ -11,7 +11,7 @@ RSpec.describe Role, type: :model do
admin banned chatroom_beta_tester comment_banned
podcast_admin pro single_resource_admin super_admin
tag_moderator mod_relations_admin tech_admin
trusted video_permission warned workshop_pass
trusted warned workshop_pass
]
expect(described_class::ROLES).to eq(expected_roles)
end

View file

@ -1,7 +1,7 @@
require "rails_helper"
RSpec.describe "Api::V0::Videos", type: :request do
let_it_be_readonly(:user) { create(:user, :video_permission) }
let(:user) { create(:user, created_at: 1.month.ago) }
def create_article(article_params = {})
default_params = {

View file

@ -2,7 +2,7 @@ require "rails_helper"
RSpec.describe "Videos", type: :request do
let(:unauthorized_user) { create(:user) }
let(:authorized_user) { create(:user, :video_permission) }
let(:authorized_user) { create(:user, created_at: 1.month.ago) }
describe "GET /videos" do
it "shows video page" do

View file

@ -61,14 +61,12 @@ RSpec.describe "Admin bans user", type: :system do
it "removes other roles if user is banned" do
user.add_role :trusted
user.add_role :video_permission
add_tag_moderator_role
ban_user
expect(user.banned).to eq(true)
expect(user.trusted).to eq(false)
expect(user.warned).to eq(false)
expect(user.has_role?(:video_permission)).to eq(false)
expect(user.has_role?(:tag_modertor)).to eq(false)
end