Commit c730881e authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '13182-fix-jest-after-gl-ui-upgrade' into 'master'

Properly wait for dropdown to be open in spec

Closes #13182

See merge request gitlab-org/gitlab-ee!14931
parents 739f8d43 7b07d182
...@@ -66,7 +66,9 @@ describe('Filter component', () => { ...@@ -66,7 +66,9 @@ describe('Filter component', () => {
describe('when the dropdown is open', () => { describe('when the dropdown is open', () => {
beforeEach(done => { beforeEach(done => {
vm.$el.querySelector('.dropdown-toggle').click(); vm.$el.querySelector('.dropdown-toggle').click();
vm.$nextTick(done); vm.$on('bv::dropdown::shown', () => {
done();
});
}); });
it('should keep the menu open after clicking on an item', done => { it('should keep the menu open after clicking on an item', done => {
......
...@@ -12088,7 +12088,7 @@ msgstr "" ...@@ -12088,7 +12088,7 @@ msgstr ""
msgid "Requests Profiles" msgid "Requests Profiles"
msgstr "" msgstr ""
msgid "Requests to these domain(s)/address(es) on the local network will be allowed when local requests from hooks and services are disabled. IP ranges such as 1:0:0:0:0:0:0:0/124 or 127.0.0.0/28 are supported. Domain wildcards are not supported currently. Use comma, semicolon, or newline to separate multiple entries. The whitelist can hold a maximum of 4000 entries. Domains should use IDNA encoding. Ex: domain.com, 192.168.1.1, 127.0.0.0/28." msgid "Requests to these domain(s)/address(es) on the local network will be allowed when local requests from hooks and services are not allowed. IP ranges such as 1:0:0:0:0:0:0:0/124 or 127.0.0.0/28 are supported. Domain wildcards are not supported currently. Use comma, semicolon, or newline to separate multiple entries. The whitelist can hold a maximum of 1000 entries. Domains should use IDNA encoding. Ex: example.com, 192.168.1.1, 127.0.0.0/28, xn--itlab-j1a.com."
msgstr "" msgstr ""
msgid "Require all users in this group to setup Two-factor authentication" msgid "Require all users in this group to setup Two-factor authentication"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment