diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-08-27 14:17:36 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-08-27 14:17:36 +0300 |
| commit | b64ba567ff4409a9e10f764297ea110023d4aec8 (patch) | |
| tree | 4e5b09105bc8563b3080e8c51948c1ceb6cd6240 | |
| parent | 5e3896122c5034c7b8c07db07be0f94c70eff86d (diff) | |
| parent | 95556c16899a37ab4505e0b3e09d9ade0128ab08 (diff) | |
Merge branch '50526-flash-hideflash-sets-transition-style-test-fails-on-master-in-local-environment' into 'master'
Resolve ""Flash hideFlash sets transition style" test fails on master in local environment"
Closes #50526
See merge request gitlab-org/gitlab-ce!21376
| -rw-r--r-- | spec/javascripts/flash_spec.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/javascripts/flash_spec.js b/spec/javascripts/flash_spec.js index 7198dbd4cf2..0a8e5a628c0 100644 --- a/spec/javascripts/flash_spec.js +++ b/spec/javascripts/flash_spec.js @@ -57,8 +57,11 @@ describe('Flash', () => { hideFlash(el); expect( - el.style.transition, - ).toBe('opacity 0.3s'); + el.style['transition-property'], + ).toBe('opacity'); + expect( + el.style['transition-duration'], + ).toBe('0.3s'); }); it('sets opacity style', () => { |