diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-10 16:20:37 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-10 16:20:37 +0000 |
| commit | 287309c3890f615d6eee4266873ab92822e29eac (patch) | |
| tree | 34c707fb76d461f4c9a87e3154d59383780bd366 /spec/javascripts/pipelines/empty_state_spec.js | |
| parent | ecee58154e8a4b706c10a7e718edb13306357f8e (diff) | |
| parent | dae93ef1ce2fbfe6342d6ec540f1b187d92a7cec (diff) | |
| download | gitlab-ce-287309c3890f615d6eee4266873ab92822e29eac.tar.gz | |
Merge branch 'master' into 41723-babel41723-babel
* master: (67 commits)
Remove Beta notice for Clusters
Adds explanation to .codeclimate.yml file
Disable eslint in codeclimate
Fix broken modal
Refactor dashboard milestone show inside dispatcher
Refactor dashboard milestone index inside dispatcher
Fix hooks not being set up properly for bare import Rake task
Change order of reference notes in permissions docs
Fix indention
Fix indention
Disable rule in modal.vue breaking tests
Revert "Fix Route validation for unchanged path"
Revert "Add test for permanent redirects of descendants"
Add test for permanent redirects of descendants
Fix Route validation for unchanged path
Fix broken tests
Migrate GitlabProject (re)move project endpoints
Add support for multiple refmaps to RemoteService#add_remote
Fixing bug related to wiki last version
Restore sidebar collapse button padding
...
Diffstat (limited to 'spec/javascripts/pipelines/empty_state_spec.js')
| -rw-r--r-- | spec/javascripts/pipelines/empty_state_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/pipelines/empty_state_spec.js b/spec/javascripts/pipelines/empty_state_spec.js index 6611b74594f..97f04844b3a 100644 --- a/spec/javascripts/pipelines/empty_state_spec.js +++ b/spec/javascripts/pipelines/empty_state_spec.js @@ -24,11 +24,11 @@ describe('Pipelines Empty State', () => { expect(component.$el.querySelector('h4').textContent).toContain('Build with confidence'); expect( - component.$el.querySelector('p').textContent, + component.$el.querySelector('p').textContent.trim().replace(/[\r\n]+/g, ' '), ).toContain('Continous Integration can help catch bugs by running your tests automatically'); expect( - component.$el.querySelector('p').textContent, + component.$el.querySelector('p').textContent.trim().replace(/[\r\n]+/g, ' '), ).toContain('Continuous Deployment can help you deliver code to your product environment'); }); |