diff --git a/app/models/role.rb b/app/models/role.rb index 4dbcfa542..26b0375d3 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -12,7 +12,6 @@ class Role < ApplicationRecord mod_relations_admin tech_admin trusted - video_permission warned workshop_pass ].freeze diff --git a/app/services/moderator/manage_activity_and_roles.rb b/app/services/moderator/manage_activity_and_roles.rb index 77bb59102..c3e9b8609 100644 --- a/app/services/moderator/manage_activity_and_roles.rb +++ b/app/services/moderator/manage_activity_and_roles.rb @@ -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 diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 7539637ec..902d89923 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -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) {} diff --git a/spec/models/role_spec.rb b/spec/models/role_spec.rb index 21bb0164b..d0b5f2a4d 100644 --- a/spec/models/role_spec.rb +++ b/spec/models/role_spec.rb @@ -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 diff --git a/spec/requests/api/v0/videos_spec.rb b/spec/requests/api/v0/videos_spec.rb index 9c9350da9..5e171ea31 100644 --- a/spec/requests/api/v0/videos_spec.rb +++ b/spec/requests/api/v0/videos_spec.rb @@ -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 = { diff --git a/spec/requests/videos_spec.rb b/spec/requests/videos_spec.rb index 9432f6a2d..cb2fd5dd2 100644 --- a/spec/requests/videos_spec.rb +++ b/spec/requests/videos_spec.rb @@ -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 diff --git a/spec/system/internal/admin_bans_or_warns_user_spec.rb b/spec/system/internal/admin_bans_or_warns_user_spec.rb index 1c990f285..a65d9db98 100644 --- a/spec/system/internal/admin_bans_or_warns_user_spec.rb +++ b/spec/system/internal/admin_bans_or_warns_user_spec.rb @@ -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