From 7f430a91bd839a396001f25fd8174f8b4d37aca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Tue, 6 Feb 2018 23:01:36 +0100 Subject: Add specs for billing_enabled change counter --- .../check_gcp_project_billing_worker_spec.rb | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'spec') diff --git a/spec/workers/check_gcp_project_billing_worker_spec.rb b/spec/workers/check_gcp_project_billing_worker_spec.rb index 7b7a7c1bc44..5878f5cefa2 100644 --- a/spec/workers/check_gcp_project_billing_worker_spec.rb +++ b/spec/workers/check_gcp_project_billing_worker_spec.rb @@ -6,6 +6,11 @@ describe CheckGcpProjectBillingWorker do subject { described_class.new.perform('token_key') } + before do + allow_any_instance_of(described_class).to receive(:check_previous_state) + allow_any_instance_of(described_class).to receive(:update_billing_change_counter) + end + context 'when there is a token in redis' do before do allow(described_class).to receive(:get_session_token).and_return(token) @@ -58,4 +63,65 @@ describe CheckGcpProjectBillingWorker do end end end + + describe 'billing change counter' do + subject { described_class.new.perform('token_key') } + + before do + allow(described_class).to receive(:get_session_token).and_return('bogustoken') + allow_any_instance_of(described_class).to receive(:try_obtain_lease_for).and_return('randomuuid') + Gitlab::Redis::SharedState.with do |redis| + allow(redis).to receive(:set) + end + end + + context 'when previous state was false' do + before do + expect_any_instance_of(described_class).to receive(:check_previous_state).and_return('false') + end + + context 'when the current state is false' do + before do + expect(CheckGcpProjectBillingService).to receive_message_chain(:new, :execute).and_return([]) + end + + it 'does not increment the billing change counter' do + Gitlab::Redis::SharedState.with do |redis| + expect(redis).not_to receive(:incr) + end + + subject + end + end + + context 'when the current state is true' do + before do + expect(CheckGcpProjectBillingService).to receive_message_chain(:new, :execute).and_return([double]) + end + + it 'increments the billing change counter' do + Gitlab::Redis::SharedState.with do |redis| + expect(redis).to receive(:incr) + end + + subject + end + end + end + + context 'when previous state was true' do + before do + expect_any_instance_of(described_class).to receive(:check_previous_state).and_return('true') + expect(CheckGcpProjectBillingService).to receive_message_chain(:new, :execute).and_return([double]) + end + + it 'does not increment the billing change counter' do + Gitlab::Redis::SharedState.with do |redis| + expect(redis).not_to receive(:incr) + end + + subject + end + end + end end -- cgit v1.2.1 From c00a17f653aaf1c0ee69d2726be182d015d3df5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Tue, 6 Feb 2018 23:22:47 +0100 Subject: Add missing newline in CheckGcpProjectBillingWorker spec --- spec/workers/check_gcp_project_billing_worker_spec.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'spec') diff --git a/spec/workers/check_gcp_project_billing_worker_spec.rb b/spec/workers/check_gcp_project_billing_worker_spec.rb index 5878f5cefa2..5f473d05e60 100644 --- a/spec/workers/check_gcp_project_billing_worker_spec.rb +++ b/spec/workers/check_gcp_project_billing_worker_spec.rb @@ -70,6 +70,7 @@ describe CheckGcpProjectBillingWorker do before do allow(described_class).to receive(:get_session_token).and_return('bogustoken') allow_any_instance_of(described_class).to receive(:try_obtain_lease_for).and_return('randomuuid') + Gitlab::Redis::SharedState.with do |redis| allow(redis).to receive(:set) end -- cgit v1.2.1 From bafab35e84e88f77d850ea13973d8fddc110225a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Wed, 7 Feb 2018 17:41:03 +0100 Subject: Use Prometheus counter instead of redis --- spec/workers/check_gcp_project_billing_worker_spec.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'spec') diff --git a/spec/workers/check_gcp_project_billing_worker_spec.rb b/spec/workers/check_gcp_project_billing_worker_spec.rb index 5f473d05e60..132f9751f92 100644 --- a/spec/workers/check_gcp_project_billing_worker_spec.rb +++ b/spec/workers/check_gcp_project_billing_worker_spec.rb @@ -87,9 +87,7 @@ describe CheckGcpProjectBillingWorker do end it 'does not increment the billing change counter' do - Gitlab::Redis::SharedState.with do |redis| - expect(redis).not_to receive(:incr) - end + expect_any_instance_of(described_class).not_to receive(:billing_changed_counter) subject end @@ -101,9 +99,7 @@ describe CheckGcpProjectBillingWorker do end it 'increments the billing change counter' do - Gitlab::Redis::SharedState.with do |redis| - expect(redis).to receive(:incr) - end + expect_any_instance_of(described_class).to receive_message_chain(:billing_changed_counter, :increment) subject end @@ -117,9 +113,7 @@ describe CheckGcpProjectBillingWorker do end it 'does not increment the billing change counter' do - Gitlab::Redis::SharedState.with do |redis| - expect(redis).not_to receive(:incr) - end + expect_any_instance_of(described_class).not_to receive(:billing_changed_counter) subject end -- cgit v1.2.1 From 0215435058ea9f9ebcc1b793425fccd22317e651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Thu, 8 Feb 2018 16:57:14 +0100 Subject: Refactor CheckGcpProjectBillingWorker --- spec/workers/check_gcp_project_billing_worker_spec.rb | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'spec') diff --git a/spec/workers/check_gcp_project_billing_worker_spec.rb b/spec/workers/check_gcp_project_billing_worker_spec.rb index 132f9751f92..179f26475e1 100644 --- a/spec/workers/check_gcp_project_billing_worker_spec.rb +++ b/spec/workers/check_gcp_project_billing_worker_spec.rb @@ -7,7 +7,7 @@ describe CheckGcpProjectBillingWorker do subject { described_class.new.perform('token_key') } before do - allow_any_instance_of(described_class).to receive(:check_previous_state) + allow(described_class).to receive(:get_billing_state) allow_any_instance_of(described_class).to receive(:update_billing_change_counter) end @@ -28,11 +28,8 @@ describe CheckGcpProjectBillingWorker do end it 'stores billing status in redis' do - redis_double = double - expect(CheckGcpProjectBillingService).to receive_message_chain(:new, :execute).and_return([double]) - expect(Gitlab::Redis::SharedState).to receive(:with).and_yield(redis_double) - expect(redis_double).to receive(:set).with(described_class.redis_shared_state_key_for(token), anything, anything) + expect(described_class).to receive(:set_billing_state).with(token, true) subject end @@ -53,7 +50,7 @@ describe CheckGcpProjectBillingWorker do context 'when there is no token in redis' do before do - allow_any_instance_of(described_class).to receive(:get_session_token).and_return(nil) + allow(described_class).to receive(:get_session_token).and_return(nil) end it 'does not call the service' do @@ -70,15 +67,12 @@ describe CheckGcpProjectBillingWorker do before do allow(described_class).to receive(:get_session_token).and_return('bogustoken') allow_any_instance_of(described_class).to receive(:try_obtain_lease_for).and_return('randomuuid') - - Gitlab::Redis::SharedState.with do |redis| - allow(redis).to receive(:set) - end + allow(described_class).to receive(:set_billing_state) end context 'when previous state was false' do before do - expect_any_instance_of(described_class).to receive(:check_previous_state).and_return('false') + expect(described_class).to receive(:get_billing_state).and_return(false) end context 'when the current state is false' do @@ -108,7 +102,7 @@ describe CheckGcpProjectBillingWorker do context 'when previous state was true' do before do - expect_any_instance_of(described_class).to receive(:check_previous_state).and_return('true') + expect(described_class).to receive(:get_billing_state).and_return(true) expect(CheckGcpProjectBillingService).to receive_message_chain(:new, :execute).and_return([double]) end -- cgit v1.2.1 From 5553524516135f573b1264785ef04f0fe638d5c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Thu, 8 Feb 2018 18:04:52 +0100 Subject: Fix GCP cluster feature spec --- spec/features/projects/clusters/gcp_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec') diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb index 02dbd3380b3..4d47cdb500c 100644 --- a/spec/features/projects/clusters/gcp_spec.rb +++ b/spec/features/projects/clusters/gcp_spec.rb @@ -25,7 +25,7 @@ feature 'Gcp Cluster', :js do context 'when user has a GCP project with billing enabled' do before do allow_any_instance_of(Projects::Clusters::GcpController).to receive(:authorize_google_project_billing) - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:google_project_billing_status).and_return('true') + allow_any_instance_of(Projects::Clusters::GcpController).to receive(:google_project_billing_status).and_return(true) end context 'when user does not have a cluster and visits cluster index page' do @@ -134,7 +134,7 @@ feature 'Gcp Cluster', :js do context 'when user does not have a GCP project with billing enabled' do before do allow_any_instance_of(Projects::Clusters::GcpController).to receive(:authorize_google_project_billing) - allow_any_instance_of(Projects::Clusters::GcpController).to receive(:google_project_billing_status).and_return('false') + allow_any_instance_of(Projects::Clusters::GcpController).to receive(:google_project_billing_status).and_return(false) visit project_clusters_path(project) -- cgit v1.2.1 From f95d9fdcc5f52e6371ca78b21538e87e9ba738f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Mon, 12 Feb 2018 18:32:10 +0100 Subject: Count all billing_state transitions with labels --- spec/workers/check_gcp_project_billing_worker_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/workers/check_gcp_project_billing_worker_spec.rb b/spec/workers/check_gcp_project_billing_worker_spec.rb index 179f26475e1..526ecf75921 100644 --- a/spec/workers/check_gcp_project_billing_worker_spec.rb +++ b/spec/workers/check_gcp_project_billing_worker_spec.rb @@ -80,8 +80,8 @@ describe CheckGcpProjectBillingWorker do expect(CheckGcpProjectBillingService).to receive_message_chain(:new, :execute).and_return([]) end - it 'does not increment the billing change counter' do - expect_any_instance_of(described_class).not_to receive(:billing_changed_counter) + it 'increments the billing change counter' do + expect_any_instance_of(described_class).to receive_message_chain(:billing_changed_counter, :increment) subject end @@ -106,8 +106,8 @@ describe CheckGcpProjectBillingWorker do expect(CheckGcpProjectBillingService).to receive_message_chain(:new, :execute).and_return([double]) end - it 'does not increment the billing change counter' do - expect_any_instance_of(described_class).not_to receive(:billing_changed_counter) + it 'increment the billing change counter' do + expect_any_instance_of(described_class).to receive_message_chain(:billing_changed_counter, :increment) subject end -- cgit v1.2.1