Skip to content

add 2fa backup codes app #1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MariusBluem merged 3 commits into from
Sep 5, 2016
Merged

add 2fa backup codes app #1171

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8acb734
add 2fa backup codes app
ChristophWurst Aug 29, 2016
ddb659d
increase core version number to trigger db ugprade and fix app manage…
ChristophWurst Sep 2, 2016
581a83c
Fix AppTest and intergration test
rullzer Sep 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix AppTest and intergration test
  • Loading branch information
@rullzer
rullzer committed Sep 5, 2016
commit 581a83c2a18a50eb93216813f3591fc940ad914c
1 change: 1 addition & 0 deletions build/integration/features/provisioning-v1.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ Feature: provisioning
| provisioning_api |
| systemtags |
| theming |
| twofactor_backupcodes |
| updatenotification |
| workflowengine |
| files_external |
Expand Down
9 changes: 7 additions & 2 deletions tests/lib/AppTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ function appConfigValuesProvider() {
'appforgroup12',
'dav',
'federatedfilesharing',
'twofactor_backupcodes',
'workflowengine',
),
false
Expand All @@ -331,6 +332,7 @@ function appConfigValuesProvider() {
'appforgroup2',
'dav',
'federatedfilesharing',
'twofactor_backupcodes',
'workflowengine',
),
false
Expand All @@ -347,6 +349,7 @@ function appConfigValuesProvider() {
'appforgroup2',
'dav',
'federatedfilesharing',
'twofactor_backupcodes',
'workflowengine',
),
false
Expand All @@ -363,6 +366,7 @@ function appConfigValuesProvider() {
'appforgroup2',
'dav',
'federatedfilesharing',
'twofactor_backupcodes',
'workflowengine',
),
false,
Expand All @@ -379,6 +383,7 @@ function appConfigValuesProvider() {
'appforgroup2',
'dav',
'federatedfilesharing',
'twofactor_backupcodes',
'workflowengine',
),
true,
Expand Down Expand Up @@ -457,11 +462,11 @@ public function testEnabledAppsCache() {
);

$apps = \OC_App::getEnabledApps();
$this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'workflowengine'), $apps);
$this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'twofactor_backupcodes', 'workflowengine'), $apps);

// mock should not be called again here
$apps = \OC_App::getEnabledApps();
$this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'workflowengine'), $apps);
$this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'twofactor_backupcodes', 'workflowengine'), $apps);

$this->restoreAppConfig();
\OC_User::setUserId(null);
Expand Down