diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 12:09:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 12:09:09 +0300 |
commit | c384315ae1ea48df2a741874b326581ded0a97e1 (patch) | |
tree | 6f50dfdb7fb726ef3e738dc5264526cf683906a3 /spec/serializers | |
parent | e1e017ddc4d64e4777bbe663c555093a7ae0cca3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers')
-rw-r--r-- | spec/serializers/cluster_basic_entity_spec.rb | 2 | ||||
-rw-r--r-- | spec/serializers/environment_status_entity_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/serializers/cluster_basic_entity_spec.rb b/spec/serializers/cluster_basic_entity_spec.rb index be03ee91784..8c3307a1837 100644 --- a/spec/serializers/cluster_basic_entity_spec.rb +++ b/spec/serializers/cluster_basic_entity_spec.rb @@ -24,7 +24,7 @@ describe ClusterBasicEntity do it 'exposes the cluster details' do expect(subject[:name]).to eq('the-cluster') - expect(subject[:path]).to eq("/#{project.full_path}/clusters/#{cluster.id}") + expect(subject[:path]).to eq("/#{project.full_path}/-/clusters/#{cluster.id}") end context 'when the user does not have permission to view the cluster' do diff --git a/spec/serializers/environment_status_entity_spec.rb b/spec/serializers/environment_status_entity_spec.rb index bac590d44e9..6d98f91cfde 100644 --- a/spec/serializers/environment_status_entity_spec.rb +++ b/spec/serializers/environment_status_entity_spec.rb @@ -73,7 +73,7 @@ describe EnvironmentStatusEntity do it 'returns metrics url' do expect(subject[:metrics_url]) - .to eq("/#{project.full_path}/environments/#{environment.id}/deployments/#{deployment.iid}/metrics") + .to eq("/#{project.full_path}/-/environments/#{environment.id}/deployments/#{deployment.iid}/metrics") end end |