From ad9079da5a397606aa5588731b5402117a3806bb Mon Sep 17 00:00:00 2001 From: Fabio Pitino Date: Mon, 17 Jun 2019 08:18:01 +0100 Subject: Make failing specs pass --- spec/features/projects/jobs/user_browses_job_spec.rb | 2 -- spec/lib/gitlab/ci/trace/stream_spec.rb | 15 ++++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/spec/features/projects/jobs/user_browses_job_spec.rb b/spec/features/projects/jobs/user_browses_job_spec.rb index 07ebc2f4792..63b698fb855 100644 --- a/spec/features/projects/jobs/user_browses_job_spec.rb +++ b/spec/features/projects/jobs/user_browses_job_spec.rb @@ -42,12 +42,10 @@ describe 'User browses a job', :js do text_to_hide = "Cloning into '/nolith/ci-tests'" expect(page).to have_content(text_to_hide) - expect(page).to have_css('.js-s-get-sources') find('.js-section-start[data-section="get-sources"]').click expect(page).not_to have_content(text_to_hide) - expect(page).to have_no_css('.js-s-get-sources') end end diff --git a/spec/lib/gitlab/ci/trace/stream_spec.rb b/spec/lib/gitlab/ci/trace/stream_spec.rb index e45ea1c2528..35250632e86 100644 --- a/spec/lib/gitlab/ci/trace/stream_spec.rb +++ b/spec/lib/gitlab/ci/trace/stream_spec.rb @@ -64,7 +64,10 @@ describe Gitlab::Ci::Trace::Stream, :clean_gitlab_redis_cache do result = stream.html - expect(result).to eq("ヾ(´༎ຶД༎ຶ`)ノ
許功蓋
") + expect(result).to eq( + "ヾ(´༎ຶД༎ຶ`)ノ
"\ + "許功蓋
"\ + "
") expect(result.encoding).to eq(Encoding.default_external) end end @@ -250,7 +253,7 @@ describe Gitlab::Ci::Trace::Stream, :clean_gitlab_redis_cache do it 'returns html content with state' do result = stream.html_with_state - expect(result.html).to eq("1234") + expect(result.html).to eq("1234") end context 'follow-up state' do @@ -266,7 +269,7 @@ describe Gitlab::Ci::Trace::Stream, :clean_gitlab_redis_cache do result = stream.html_with_state(last_result.state) expect(result.append).to be_truthy - expect(result.html).to eq("5678") + expect(result.html).to eq("5678") end end end @@ -302,11 +305,13 @@ describe Gitlab::Ci::Trace::Stream, :clean_gitlab_redis_cache do describe '#html' do shared_examples_for 'htmls' do it "returns html" do - expect(stream.html).to eq("12
34
56") + expect(stream.html).to eq( + "12
34
"\ + "56
") end it "returns html for last line only" do - expect(stream.html(last_lines: 1)).to eq("56") + expect(stream.html(last_lines: 1)).to eq("56") end end -- cgit v1.2.1