diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 15:07:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 15:07:33 +0300 |
commit | 784fae4b9d7e92350075df2a43d06893080ed1e6 (patch) | |
tree | c7a6fd444acd6897622b233b250a34fd176f01da /spec/serializers | |
parent | fc53ce8e6ca67bf217470179a1ea6cf139bcffad (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers')
-rw-r--r-- | spec/serializers/job_entity_spec.rb | 6 | ||||
-rw-r--r-- | spec/serializers/stage_entity_spec.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/serializers/job_entity_spec.rb b/spec/serializers/job_entity_spec.rb index 4b2d4701334..60843f1a599 100644 --- a/spec/serializers/job_entity_spec.rb +++ b/spec/serializers/job_entity_spec.rb @@ -153,11 +153,11 @@ describe JobEntity do end it 'states that it failed' do - expect(subject[:status][:label]).to eq('failed') + expect(subject[:status][:label]).to eq(s_('CiStatusLabel|failed')) end it 'indicates the failure reason on tooltip' do - expect(subject[:status][:tooltip]).to eq('failed - (API failure)') + expect(subject[:status][:tooltip]).to eq("#{s_('CiStatusLabel|failed')} - (API failure)") end it 'includes a callout message with a verbose output' do @@ -181,7 +181,7 @@ describe JobEntity do end it 'indicates the failure reason on tooltip' do - expect(subject[:status][:tooltip]).to eq('failed - (API failure) (allowed to fail)') + expect(subject[:status][:tooltip]).to eq("#{s_('CiStatusLabel|failed')} - (API failure) (allowed to fail)") end it 'includes a callout message with a verbose output' do diff --git a/spec/serializers/stage_entity_spec.rb b/spec/serializers/stage_entity_spec.rb index 58573df31e7..fb08d6994ae 100644 --- a/spec/serializers/stage_entity_spec.rb +++ b/spec/serializers/stage_entity_spec.rb @@ -29,7 +29,7 @@ describe StageEntity do it 'contains detailed status' do expect(subject[:status]).to include :text, :label, :group, :icon, :tooltip - expect(subject[:status][:label]).to eq 'passed' + expect(subject[:status][:label]).to eq s_('CiStatusLabel|passed') end it 'contains valid name' do @@ -47,7 +47,7 @@ describe StageEntity do end it 'contains stage title' do - expect(subject[:title]).to eq 'test: passed' + expect(subject[:title]).to eq "test: #{s_('CiStatusLabel|passed')}" end it 'does not contain play_details info' do |