From b610d25872999666c26441d8fa828064eb0225a6 Mon Sep 17 00:00:00 2001 From: dstull Date: Tue, 27 Aug 2019 10:12:08 -0400 Subject: Refactor tests as per feedback --- spec/lib/gitlab_spec.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/spec/lib/gitlab_spec.rb b/spec/lib/gitlab_spec.rb index 2ee3785138e..5fcf56b2378 100644 --- a/spec/lib/gitlab_spec.rb +++ b/spec/lib/gitlab_spec.rb @@ -98,30 +98,26 @@ describe Gitlab do describe '.dev_env_org_or_com?' do it 'is true when on .com' do - allow(described_class).to receive(:com?).and_return(true) - allow(described_class).to receive(:org?).and_return(false) + allow(described_class).to receive_messages(com?: true, org?: false) expect(described_class.dev_env_org_or_com?).to eq true end it 'is true when org' do - allow(described_class).to receive(:org?).and_return(true) - allow(described_class).to receive(:com?).and_return(false) + allow(described_class).to receive_messages(com?: false, org?: true) expect(described_class.dev_env_org_or_com?).to eq true end it 'is true when dev env' do - allow(described_class).to receive(:org?).and_return(false) - allow(described_class).to receive(:com?).and_return(false) + allow(described_class).to receive_messages(com?: false, org?: false) allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development')) expect(described_class.dev_env_org_or_com?).to eq true end it 'is false when not dev, org or com' do - allow(described_class).to receive(:org?).and_return(false) - allow(described_class).to receive(:com?).and_return(false) + allow(described_class).to receive_messages(com?: false, org?: false) expect(described_class.dev_env_org_or_com?).to eq false end -- cgit v1.2.1