Commit 8d8c6ced authored by Stan Hu's avatar Stan Hu

Be consistent and make active_users active_user_count

parent 0a3f398a
...@@ -30,7 +30,7 @@ class GitlabUsagePingWorker ...@@ -30,7 +30,7 @@ class GitlabUsagePingWorker
def data def data
usage_data = { version: Gitlab::VERSION, usage_data = { version: Gitlab::VERSION,
active_users: current_active_user_count } active_user_count: current_active_user_count }
license = License.current license = License.current
if license if license
......
...@@ -10,7 +10,7 @@ describe GitlabUsagePingWorker do ...@@ -10,7 +10,7 @@ describe GitlabUsagePingWorker do
expect(data[:license_md5]).to eq(Digest::MD5.hexdigest(license.data)) expect(data[:license_md5]).to eq(Digest::MD5.hexdigest(license.data))
expect(data[:version]).to eq(Gitlab::VERSION) expect(data[:version]).to eq(Gitlab::VERSION)
expect(data[:licensee]).to eq(license.licensee) expect(data[:licensee]).to eq(license.licensee)
expect(data[:active_users]).to eq(User.active.count) expect(data[:active_user_count]).to eq(User.active.count)
expect(data[:licensee]).to eq(license.licensee) expect(data[:licensee]).to eq(license.licensee)
expect(data[:license_user_count]).to eq(license.user_count) expect(data[:license_user_count]).to eq(license.user_count)
expect(data[:license_starts_at]).to eq(license.starts_at) expect(data[:license_starts_at]).to eq(license.starts_at)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment