Skip to content

Commit 12f6d3c

Browse files
danmooney2danmooney2
committed
B2B-1785: Cannot enable remote storage with install command when modules are not enabled
- Group tests with respective data providers
1 parent 3c146cb commit 12f6d3c

File tree

1 file changed

+115
-115
lines changed

1 file changed

+115
-115
lines changed

‎setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php

Lines changed: 115 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,110 @@ public function testInstall(array $request, array $logMessages)
426426
$this->object->install($request);
427427
}
428428

429+
/**
430+
* @return array
431+
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
432+
*/
433+
public function installDataProvider()
434+
{
435+
return [
436+
[
437+
'request' => $this->request,
438+
'logMessages' => [
439+
['Starting Magento installation:'],
440+
['File permissions check...'],
441+
['Required extensions check...'],
442+
['Enabling Maintenance Mode...'],
443+
['Installing deployment configuration...'],
444+
['Installing database schema:'],
445+
['Schema creation/updates:'],
446+
['Module \'Foo_One\':'],
447+
['Module \'Bar_Two\':'],
448+
['Schema post-updates:'],
449+
['Module \'Foo_One\':'],
450+
['Module \'Bar_Two\':'],
451+
['Installing search configuration...'],
452+
['Validating remote storage configuration...'],
453+
['Installing user configuration...'],
454+
['Enabling caches:'],
455+
['Current status:'],
456+
['foo: 1'],
457+
['bar: 1'],
458+
['Installing data...'],
459+
['Data install/update:'],
460+
['Disabling caches:'],
461+
['Current status:'],
462+
['Module \'Foo_One\':'],
463+
['Module \'Bar_Two\':'],
464+
['Data post-updates:'],
465+
['Module \'Foo_One\':'],
466+
['Module \'Bar_Two\':'],
467+
['Enabling caches:'],
468+
['Current status:'],
469+
['Caches clearing:'],
470+
['Cache cleared successfully'],
471+
['Disabling Maintenance Mode:'],
472+
['Post installation file permissions check...'],
473+
['Write installation date...'],
474+
['Sample Data is installed with errors. See log file for details']
475+
],
476+
],
477+
[
478+
'request' => [
479+
ConfigOptionsListConstants::INPUT_KEY_DB_HOST => '127.0.0.1',
480+
ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'magento',
481+
ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'magento',
482+
ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => 'encryption_key',
483+
ConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME => 'backend',
484+
AdminAccount::KEY_USER => 'admin',
485+
AdminAccount::KEY_PASSWORD => '123',
486+
AdminAccount::KEY_EMAIL => 'admin@example.com',
487+
AdminAccount::KEY_FIRST_NAME => 'John',
488+
AdminAccount::KEY_LAST_NAME => 'Doe',
489+
],
490+
'logMessages' => [
491+
['Starting Magento installation:'],
492+
['File permissions check...'],
493+
['Required extensions check...'],
494+
['Enabling Maintenance Mode...'],
495+
['Installing deployment configuration...'],
496+
['Installing database schema:'],
497+
['Schema creation/updates:'],
498+
['Module \'Foo_One\':'],
499+
['Module \'Bar_Two\':'],
500+
['Schema post-updates:'],
501+
['Module \'Foo_One\':'],
502+
['Module \'Bar_Two\':'],
503+
['Installing search configuration...'],
504+
['Validating remote storage configuration...'],
505+
['Installing user configuration...'],
506+
['Enabling caches:'],
507+
['Current status:'],
508+
['foo: 1'],
509+
['bar: 1'],
510+
['Installing data...'],
511+
['Data install/update:'],
512+
['Disabling caches:'],
513+
['Current status:'],
514+
['Module \'Foo_One\':'],
515+
['Module \'Bar_Two\':'],
516+
['Data post-updates:'],
517+
['Module \'Foo_One\':'],
518+
['Module \'Bar_Two\':'],
519+
['Enabling caches:'],
520+
['Current status:'],
521+
['Installing admin user...'],
522+
['Caches clearing:'],
523+
['Cache cleared successfully'],
524+
['Disabling Maintenance Mode:'],
525+
['Post installation file permissions check...'],
526+
['Write installation date...'],
527+
['Sample Data is installed with errors. See log file for details']
528+
],
529+
],
530+
];
531+
}
532+
429533
/**
430534
* Test installation with invalid remote storage configuration raises ValidationException via validation
431535
* and reverts configuration back to local file driver
@@ -596,6 +700,17 @@ public function testInstallWithInvalidRemoteStorageConfiguration(bool $isDeploym
596700
$this->object->install($request);
597701
}
598702

703+
/**
704+
* @return array
705+
*/
706+
public function installWithInvalidRemoteStorageConfigurationDataProvider()
707+
{
708+
return [
709+
[true],
710+
[false]
711+
];
712+
}
713+
599714
/**
600715
* Test installation with invalid remote storage configuration is able to be caught earlier than
601716
* the queued validation step if necessary, and that configuration is reverted back to local file driver.
@@ -722,121 +837,6 @@ public function testInstallWithInvalidRemoteStorageConfigurationWithEarlyRuntime
722837
$this->object->install($request);
723838
}
724839

725-
/**
726-
* @return array
727-
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
728-
*/
729-
public function installDataProvider()
730-
{
731-
return [
732-
[
733-
'request' => $this->request,
734-
'logMessages' => [
735-
['Starting Magento installation:'],
736-
['File permissions check...'],
737-
['Required extensions check...'],
738-
['Enabling Maintenance Mode...'],
739-
['Installing deployment configuration...'],
740-
['Installing database schema:'],
741-
['Schema creation/updates:'],
742-
['Module \'Foo_One\':'],
743-
['Module \'Bar_Two\':'],
744-
['Schema post-updates:'],
745-
['Module \'Foo_One\':'],
746-
['Module \'Bar_Two\':'],
747-
['Installing search configuration...'],
748-
['Validating remote storage configuration...'],
749-
['Installing user configuration...'],
750-
['Enabling caches:'],
751-
['Current status:'],
752-
['foo: 1'],
753-
['bar: 1'],
754-
['Installing data...'],
755-
['Data install/update:'],
756-
['Disabling caches:'],
757-
['Current status:'],
758-
['Module \'Foo_One\':'],
759-
['Module \'Bar_Two\':'],
760-
['Data post-updates:'],
761-
['Module \'Foo_One\':'],
762-
['Module \'Bar_Two\':'],
763-
['Enabling caches:'],
764-
['Current status:'],
765-
['Caches clearing:'],
766-
['Cache cleared successfully'],
767-
['Disabling Maintenance Mode:'],
768-
['Post installation file permissions check...'],
769-
['Write installation date...'],
770-
['Sample Data is installed with errors. See log file for details']
771-
],
772-
],
773-
[
774-
'request' => [
775-
ConfigOptionsListConstants::INPUT_KEY_DB_HOST => '127.0.0.1',
776-
ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'magento',
777-
ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'magento',
778-
ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => 'encryption_key',
779-
ConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME => 'backend',
780-
AdminAccount::KEY_USER => 'admin',
781-
AdminAccount::KEY_PASSWORD => '123',
782-
AdminAccount::KEY_EMAIL => 'admin@example.com',
783-
AdminAccount::KEY_FIRST_NAME => 'John',
784-
AdminAccount::KEY_LAST_NAME => 'Doe',
785-
],
786-
'logMessages' => [
787-
['Starting Magento installation:'],
788-
['File permissions check...'],
789-
['Required extensions check...'],
790-
['Enabling Maintenance Mode...'],
791-
['Installing deployment configuration...'],
792-
['Installing database schema:'],
793-
['Schema creation/updates:'],
794-
['Module \'Foo_One\':'],
795-
['Module \'Bar_Two\':'],
796-
['Schema post-updates:'],
797-
['Module \'Foo_One\':'],
798-
['Module \'Bar_Two\':'],
799-
['Installing search configuration...'],
800-
['Validating remote storage configuration...'],
801-
['Installing user configuration...'],
802-
['Enabling caches:'],
803-
['Current status:'],
804-
['foo: 1'],
805-
['bar: 1'],
806-
['Installing data...'],
807-
['Data install/update:'],
808-
['Disabling caches:'],
809-
['Current status:'],
810-
['Module \'Foo_One\':'],
811-
['Module \'Bar_Two\':'],
812-
['Data post-updates:'],
813-
['Module \'Foo_One\':'],
814-
['Module \'Bar_Two\':'],
815-
['Enabling caches:'],
816-
['Current status:'],
817-
['Installing admin user...'],
818-
['Caches clearing:'],
819-
['Cache cleared successfully'],
820-
['Disabling Maintenance Mode:'],
821-
['Post installation file permissions check...'],
822-
['Write installation date...'],
823-
['Sample Data is installed with errors. See log file for details']
824-
],
825-
],
826-
];
827-
}
828-
829-
/**
830-
* @return array
831-
*/
832-
public function installWithInvalidRemoteStorageConfigurationDataProvider()
833-
{
834-
return [
835-
[true],
836-
[false]
837-
];
838-
}
839-
840840
/**
841841
* Test for InstallDataFixtures
842842
*

0 commit comments

Comments
 (0)