diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-22 10:19:28 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-22 10:19:28 +0000 |
commit | 5de85992bb76e041222fbee06f3844bf275aaf66 (patch) | |
tree | c75518c6c3144a35ae0230fc09f366df5cefc846 /spec/javascripts | |
parent | de6c27f64a822c2d32e04451d6187925cf58de82 (diff) | |
parent | 68cc9ea22daa8c13b2cb880dcde2606b6b5b43b6 (diff) | |
download | gitlab-ce-5de85992bb76e041222fbee06f3844bf275aaf66.tar.gz |
Merge branch 'master' into vue-mr-widget-state
* master:
Split the setup-test-env job in two
Remove the wait time for the login form check
Fix protected branches API to accept name parameter with dot
Update outdated docs for CI/CD quick start
_never_ unset gitlab.full_path
Backport to match EE icons
Add horizontal scroll to wiki tables
Update best_practices.md Remove duplicate list item in "General Guidelines" Section.
Permits 'password_authentication_enabled_for_git' parameter for ApplicationSettingsController
Move rugged-call from Project#write_repository_config to Git::Repository#write_config
doc: Spelling fixes
Update Auto DevOps template
Disable scss-lint around text-decoration-skip
Add text-decoration-skip: ink to all underlined elements
Fix Shows signin tab after new user email confirmation
Fixes mistake in change log doc.
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/signin_tabs_memoizer_spec.js | 7 | ||||
-rw-r--r-- | spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/spec/javascripts/signin_tabs_memoizer_spec.js b/spec/javascripts/signin_tabs_memoizer_spec.js index c4f500788b2..b1b03ef1e09 100644 --- a/spec/javascripts/signin_tabs_memoizer_spec.js +++ b/spec/javascripts/signin_tabs_memoizer_spec.js @@ -53,6 +53,13 @@ import SigninTabsMemoizer from '~/pages/sessions/new/signin_tabs_memoizer'; expect(memo.readData()).toEqual('#standard'); }); + it('overrides last selected tab with hash tag when given', () => { + window.location.hash = '#ldap'; + createMemoizer(); + + expect(memo.readData()).toEqual('#ldap'); + }); + describe('class constructor', () => { beforeEach(() => { memo = createMemoizer(); diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js index 9230b5874df..073f26cc78f 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js @@ -170,14 +170,14 @@ describe('MRWidgetReadyToMerge', () => { expect(vm.iconClass).toEqual('success'); }); - it('shows x for failed status', () => { + it('shows warning icon for failed status', () => { vm.mr.hasCI = true; - expect(vm.iconClass).toEqual('failed'); + expect(vm.iconClass).toEqual('warning'); }); - it('shows x for merge not allowed', () => { + it('shows warning icon for merge not allowed', () => { vm.mr.hasCI = true; - expect(vm.iconClass).toEqual('failed'); + expect(vm.iconClass).toEqual('warning'); }); }); |