diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-15 20:07:51 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-15 20:07:51 +0000 |
| commit | 27e4a95221539ccb6749b2de8a75a8c17427115f (patch) | |
| tree | 23f12cec60e1b8b724f6084949496f932da71735 /spec/javascripts | |
| parent | 89665649b01c8adef03e30d7f8e1ee633aa22e45 (diff) | |
| parent | 341d8bc3f7fbe3763250af1e89020b81dad34bb8 (diff) | |
| download | gitlab-ce-27e4a95221539ccb6749b2de8a75a8c17427115f.tar.gz | |
Merge branch '17341-firefox-u2f' into 'master'
Allow U2F devices to be used in Firefox
- Adds U2F support for Firefox
- Improve U2F feature detection logic
- Have authentication flow be closer to the spec (single challenge instead of a challenge for each `signRequest`)
- Closes #17341
- Related to #15337
See merge request !5177
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/u2f/authenticate_spec.coffee | 3 | ||||
| -rw-r--r-- | spec/javascripts/u2f/register_spec.js.coffee | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/spec/javascripts/u2f/authenticate_spec.coffee b/spec/javascripts/u2f/authenticate_spec.coffee index e8a2892d678..8ffeda11704 100644 --- a/spec/javascripts/u2f/authenticate_spec.coffee +++ b/spec/javascripts/u2f/authenticate_spec.coffee @@ -5,13 +5,12 @@ #= require ./mock_u2f_device describe 'U2FAuthenticate', -> - U2FUtil.enableTestMode() fixture.load('u2f/authenticate') beforeEach -> @u2fDevice = new MockU2FDevice @container = $("#js-authenticate-u2f") - @component = new U2FAuthenticate(@container, {}, "token") + @component = new U2FAuthenticate(@container, {sign_requests: []}, "token") @component.start() it 'allows authenticating via a U2F device', -> diff --git a/spec/javascripts/u2f/register_spec.js.coffee b/spec/javascripts/u2f/register_spec.js.coffee index 0858abeca1a..87dc769792b 100644 --- a/spec/javascripts/u2f/register_spec.js.coffee +++ b/spec/javascripts/u2f/register_spec.js.coffee @@ -5,7 +5,6 @@ #= require ./mock_u2f_device describe 'U2FRegister', -> - U2FUtil.enableTestMode() fixture.load('u2f/register') beforeEach -> |