Skip to content
Snippets Groups Projects
Verified Commit 3103eba3 authored by Martin Čavoj's avatar Martin Čavoj :two: Committed by GitLab
Browse files

Revert "Merge branch '439129-do-not-check-license-capacity-for-security-policy-bot' into 'master'"

This reverts merge request !148893
parent 3b196e0b
No related branches found
No related tags found
1 merge request!149274Revert "Skip license capacity check for security policy bot user"
Pipeline #1249293201 passed
Pipeline: GitLab

#1249305646

    Pipeline: GitLab

    #1249300554

      Pipeline: GitLab

      #1249300454

        ......@@ -833,7 +833,6 @@ def has_free_or_no_subscription?
        override :capacity_left_for_user?
        def capacity_left_for_user?(user)
        return true unless user_cap_available?
        return true if user.security_policy_bot?
        return true if ::Member.in_hierarchy(root_ancestor).with_user(user).with_state(:active).exists?
        !user_cap_reached?
        ......
        ......@@ -2092,7 +2092,6 @@
        describe '#capacity_left_for_user?' do
        let_it_be(:group) { create(:group) }
        let_it_be(:user) { create(:user) }
        let_it_be(:security_policy_bot) { create(:user, :security_policy_bot) }
        where(:user_cap_available, :user_cap_reached, :existing_membership, :result) do
        false | false | false | true
        ......@@ -2104,27 +2103,17 @@
        true | true | false | false
        end
        subject { group.capacity_left_for_user?(current_user) }
        subject { group.capacity_left_for_user?(user) }
        with_them do
        before do
        create(:group_member, source: group, user: current_user) if existing_membership
        create(:group_member, source: group, user: user) if existing_membership
        allow(group).to receive(:user_cap_available?).and_return(user_cap_available)
        allow(group).to receive(:user_cap_reached?).and_return(user_cap_reached)
        end
        context 'when user is human' do
        let(:current_user) { user }
        it { is_expected.to eq(result) }
        end
        context 'when user is a security policy bot user' do
        let(:current_user) { security_policy_bot }
        it { is_expected.to be true }
        end
        it { is_expected.to eq(result) }
        end
        end
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment