diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-06-16 02:04:09 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-16 02:04:09 +0300 |
commit | fe125f8dc9925a61d20913ffdd15d2ae03cbde75 (patch) | |
tree | 5a0671ad5f2a5c06c7ed6d6e74d8d6ff521d7f3a /spec/javascripts | |
parent | 6f8626de0609da6c789457153b2b19dc79db2c95 (diff) | |
parent | 5d16d50cebb115773c1a16a141adab150eec8764 (diff) |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown
# Conflicts:
# app/assets/javascripts/lib/common_utils.js.coffee
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/application_spec.js.coffee | 30 | ||||
-rw-r--r-- | spec/javascripts/fixtures/application.html.haml | 2 | ||||
-rw-r--r-- | spec/javascripts/fixtures/u2f/register.html.haml | 3 |
3 files changed, 34 insertions, 1 deletions
diff --git a/spec/javascripts/application_spec.js.coffee b/spec/javascripts/application_spec.js.coffee new file mode 100644 index 00000000000..8af39c41f2f --- /dev/null +++ b/spec/javascripts/application_spec.js.coffee @@ -0,0 +1,30 @@ +#= require lib/common_utils + +describe 'Application', -> + describe 'disable buttons', -> + fixture.preload('application.html') + + beforeEach -> + fixture.load('application.html') + + it 'should prevent default action for disabled buttons', -> + + gl.utils.preventDisabledButtons() + + isClicked = false + $button = $ '#test-button' + + $button.click -> isClicked = true + $button.trigger 'click' + + expect(isClicked).toBe false + + + it 'should be on the same page if a disabled link clicked', -> + + locationBeforeLinkClick = window.location.href + gl.utils.preventDisabledButtons() + + $('#test-link').click() + + expect(window.location.href).toBe locationBeforeLinkClick diff --git a/spec/javascripts/fixtures/application.html.haml b/spec/javascripts/fixtures/application.html.haml new file mode 100644 index 00000000000..3fc6114407d --- /dev/null +++ b/spec/javascripts/fixtures/application.html.haml @@ -0,0 +1,2 @@ +%a#test-link.btn.disabled{:href => "/foo"} Test link +%button#test-button.btn.disabled Test Button diff --git a/spec/javascripts/fixtures/u2f/register.html.haml b/spec/javascripts/fixtures/u2f/register.html.haml index 393c0613fd3..5ed51be689c 100644 --- a/spec/javascripts/fixtures/u2f/register.html.haml +++ b/spec/javascripts/fixtures/u2f/register.html.haml @@ -1 +1,2 @@ -= render partial: "u2f/register", locals: { create_u2f_profile_two_factor_auth_path: '/profile/two_factor_auth/create_u2f' } +- user = FactoryGirl.build(:user, :two_factor_via_otp) += render partial: "u2f/register", locals: { create_u2f_profile_two_factor_auth_path: '/profile/two_factor_auth/create_u2f', current_user: user } |