Code review comments appliedfj-count-web-ide-merge-requests

2 files changed, 19 insertions, 36 deletions

diff --git a/spec/controllers/projects/merge_requests/creations_controller_spec.rb b/spec/controllers/projects/merge_requests/creations_controller_spec.rb
index e7b17a42965..3816e1c7a31 100644
--- a/spec/controllers/projects/merge_requests/creations_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/creations_controller_spec.rb
@@ -229,7 +229,7 @@ describe Projects::MergeRequests::CreationsController do
     it 'creates merge request' do
       expect do
         post_request(params)
-      end.to change { MergeRequest.count }.from(0).to(1)
+      end.to change { MergeRequest.count }.by(1)
     end
 
     context 'when the merge request is not created from the web ide' do
diff --git a/spec/lib/gitlab/usage_data_counters/web_ide_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/web_ide_counter_spec.rb
index 50d73c4d083..b5e32d1875f 100644
--- a/spec/lib/gitlab/usage_data_counters/web_ide_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/web_ide_counter_spec.rb
@@ -3,51 +3,34 @@
 require 'spec_helper'
 
 describe Gitlab::UsageDataCounters::WebIdeCounter, :clean_gitlab_redis_shared_state do
-  describe '.increment_commits_count' do
-    it 'increments the web ide commits counter by 1' do
-      expect do
-        described_class.increment_commits_count
-      end.to change { described_class.total_commits_count }.by(1)
-    end
-  end
-
-  describe '.total_commits_count' do
-    it 'returns the total amount of web ide commits' do
-      2.times { described_class.increment_commits_count }
+  shared_examples 'counter examples' do
+    it 'increments counter and return the total count' do
+      expect(described_class.public_send(total_counter_method)).to eq(0)
 
-      expect(described_class.total_commits_count).to eq(2)
-    end
-  end
+      2.times { described_class.public_send(increment_counter_method) }
 
-  describe '.increment_merge_requests_count' do
-    it 'increments the web ide merge requests counter by 1' do
-      expect do
-        described_class.increment_merge_requests_count
-      end.to change { described_class.total_merge_requests_count }.by(1)
+      expect(described_class.public_send(total_counter_method)).to eq(2)
     end
   end
 
-  describe '.total_merge_requests_count' do
-    it 'returns the total amount of web ide merge requests' do
-      2.times { described_class.increment_merge_requests_count }
+  describe 'commits counter' do
+    let(:increment_counter_method) { :increment_commits_count }
+    let(:total_counter_method) { :total_commits_count }
 
-      expect(described_class.total_merge_requests_count).to eq(2)
-    end
+    it_behaves_like 'counter examples'
   end
 
-  describe '.increment_views_count' do
-    it 'increments the web ide views counter by 1' do
-      expect do
-        described_class.increment_views_count
-      end.to change { described_class.total_views_count }.by(1)
-    end
+  describe 'merge requests counter' do
+    let(:increment_counter_method) { :increment_merge_requests_count }
+    let(:total_counter_method) { :total_merge_requests_count }
+
+    it_behaves_like 'counter examples'
   end
 
-  describe '.total_views_count' do
-    it 'returns the total amount of web ide views' do
-      2.times { described_class.increment_views_count }
+  describe 'views counter' do
+    let(:increment_counter_method) { :increment_views_count }
+    let(:total_counter_method) { :total_views_count }
 
-      expect(described_class.total_views_count).to eq(2)
-    end
+    it_behaves_like 'counter examples'
   end
 end