Commit 87290f1f authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch '328465-send-version' into 'master'

Sync gitlab version during seat link

See merge request gitlab-org/gitlab!60362
parents 5827276c 63ef0552
......@@ -49,6 +49,7 @@ module Gitlab
def data
{
gitlab_version: Gitlab::VERSION,
timestamp: timestamp.iso8601,
date: timestamp.to_date.to_s,
license_key: key,
......
---
title: Sync gitlab version during seat link
merge_request: 60362
author:
type: changed
......@@ -81,6 +81,7 @@ RSpec.describe Gitlab::SeatLinkData do
it 'returns payload data as a JSON string' do
expect(subject.to_json).to eq(
{
gitlab_version: Gitlab::VERSION,
timestamp: timestamp.iso8601,
date: timestamp.to_date.iso8601,
license_key: key,
......
......@@ -18,6 +18,7 @@ RSpec.describe SyncSeatLinkRequestWorker, type: :worker do
expect(WebMock).to have_requested(:post, seat_link_url).with(
headers: { 'Content-Type' => 'application/json' },
body: {
gitlab_version: Gitlab::VERSION,
timestamp: '2019-12-31T23:20:12Z',
date: '2019-12-31',
license_key: '123',
......@@ -71,6 +72,7 @@ RSpec.describe SyncSeatLinkRequestWorker, type: :worker do
expect(WebMock).to have_requested(:post, seat_link_url).with(
headers: { 'Content-Type' => 'application/json' },
body: {
gitlab_version: Gitlab::VERSION,
timestamp: '2020-01-01T00:00:00Z',
date: '2020-01-01',
license_key: '123',
......
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