From 96b0c1245c93585a8b0fe23e22306d32ff4e4905 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 10 Jan 2020 12:07:47 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/views/projects/ci/lints/show.html.haml_spec.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'spec/views') diff --git a/spec/views/projects/ci/lints/show.html.haml_spec.rb b/spec/views/projects/ci/lints/show.html.haml_spec.rb index ea67478ff98..8c3cf04bae6 100644 --- a/spec/views/projects/ci/lints/show.html.haml_spec.rb +++ b/spec/views/projects/ci/lints/show.html.haml_spec.rb @@ -75,6 +75,7 @@ describe 'projects/ci/lints/show' do it 'shows the correct values' do render + expect(rendered).to have_content('Status: syntax is correct') expect(rendered).to have_content('Tag list: dotnet') expect(rendered).to have_content('Only policy: refs, test@dude/repo') expect(rendered).to have_content('Except policy: refs, deploy') @@ -87,14 +88,14 @@ describe 'projects/ci/lints/show' do before do assign(:project, project) assign(:status, false) - assign(:error, 'Undefined error') + assign(:errors, ['Undefined error']) end it 'shows error message' do render expect(rendered).to have_content('Status: syntax is incorrect') - expect(rendered).to have_content('Error: Undefined error') + expect(rendered).to have_content('Undefined error') expect(rendered).not_to have_content('Tag list:') end end -- cgit v1.2.3