diff options
author | Stan Hu <stanhu@gmail.com> | 2019-08-12 21:35:16 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-08-12 21:35:16 +0300 |
commit | afe0cd0af619a0c5758ce6adf95a5e3782227a9f (patch) | |
tree | c1163f01d7f02d9b0cc47172dcd35e5b821a14ac /spec | |
parent | 5971cd15086f65fa7202b05b26fc2f980b9f2767 (diff) | |
parent | 208f9dfe03a85ccec3389d6ae024a6f7ffec3ddc (diff) |
Merge branch 'update-graphicsmagick-to-1.3.33' into 'master'
Update GraphicsMagick from 1.3.29 to 1.3.33
See merge request gitlab-org/gitlab-ce!31692
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascripts/jobs/components/job_log_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/jobs/components/job_log_spec.js b/spec/javascripts/jobs/components/job_log_spec.js index 3485eec7763..24bb6b9a48b 100644 --- a/spec/javascripts/jobs/components/job_log_spec.js +++ b/spec/javascripts/jobs/components/job_log_spec.js @@ -11,7 +11,7 @@ describe('Job Log', () => { let vm; const trace = - 'Running with gitlab-runner 11.1.0 (081978aa)<br> on docker-auto-scale-com d5ae8d25<br>Using Docker executor with image dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 ...<br>'; + '<span>Running with gitlab-runner 12.1.0 (de7731dd)<br/></span><span> on docker-auto-scale-com d5ae8d25<br/></span><div class="js-section-start fa fa-caret-down append-right-8 cursor-pointer" data-timestamp="1565502765" data-section="prepare-executor" role="button"></div><span class="section js-section-header section-header js-s-prepare-executor">Using Docker executor with image ruby:2.6 ...<br/></span>'; beforeEach(() => { store = createStore(); @@ -32,7 +32,7 @@ describe('Job Log', () => { }); expect(vm.$el.querySelector('code').textContent).toContain( - 'Running with gitlab-runner 11.1.0 (081978aa)', + 'Running with gitlab-runner 12.1.0 (de7731dd)', ); }); |