diff --git a/src/Form/BackupMigrateAdvancedBackupForm.php b/src/Form/BackupMigrateAdvancedBackupForm.php index 550fd8f..2948205 100644 --- a/src/Form/BackupMigrateAdvancedBackupForm.php +++ b/src/Form/BackupMigrateAdvancedBackupForm.php @@ -27,7 +27,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { // Theme the form if we want it inline. // @FIXME // $form['#theme'] = 'backup_migrate_ui_manual_quick_backup_form_inline'; - $bam = backup_migrate_get_service_object(); + $bam = backup_migrate_get_service_object([]); $form['source'] = [ '#type' => 'fieldset', diff --git a/src/Form/BackupMigrateQuickBackupForm.php b/src/Form/BackupMigrateQuickBackupForm.php index 48d010f..54b574d 100644 --- a/src/Form/BackupMigrateQuickBackupForm.php +++ b/src/Form/BackupMigrateQuickBackupForm.php @@ -28,7 +28,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { // Theme the form if we want it inline. // @FIXME // $form['#theme'] = 'backup_migrate_ui_manual_quick_backup_form_inline';. - $bam = backup_migrate_get_service_object(); + $bam = backup_migrate_get_service_object([]); $form['quickbackup'] = [ '#type' => 'fieldset', @@ -43,7 +43,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form['quickbackup']['settings_profile_id'] = DrupalConfigHelper::getSettingsProfileSelector(t('Settings Profile')); unset($form['quickbackup']['destination_id']['#options']['upload']); // Create the service - // $bam = backup_migrate_get_service_object(); + // $bam = backup_migrate_get_service_object([]); // $bam->setConfig($config); // $bam->plugins()->get('namer')->confGet('filename'); // $form['quickbackup']['source_id'] = _backup_migrate_get_source_pulldown(\Drupal::config('backup_migrate.settings')->get('backup_migrate_source_id'));. diff --git a/src/Form/BackupMigrateRestoreForm.php b/src/Form/BackupMigrateRestoreForm.php index 391b194..864fef7 100644 --- a/src/Form/BackupMigrateRestoreForm.php +++ b/src/Form/BackupMigrateRestoreForm.php @@ -25,7 +25,7 @@ public function getFormId() { public function buildForm(array $form, FormStateInterface $form_state) { $form = []; - $bam = backup_migrate_get_service_object(); + $bam = backup_migrate_get_service_object([]); $form['backup_migrate_restore_upload'] = [ '#title' => $this->t('Upload a Backup File'), diff --git a/src/Form/BackupRestoreForm.php b/src/Form/BackupRestoreForm.php index 792f434..e88cad7 100644 --- a/src/Form/BackupRestoreForm.php +++ b/src/Form/BackupRestoreForm.php @@ -70,7 +70,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $backup_m $this->destination = $backup_migrate_destination; $this->backup_id = $backup_id; - $bam = backup_migrate_get_service_object(); + $bam = backup_migrate_get_service_object([]); $form['source_id'] = DrupalConfigHelper::getPluginSelector($bam->sources(), $this->t('Restore To')); $conf_schema = $bam->plugins()->map('configSchema', ['operation' => 'restore']); diff --git a/tests/src/Functional/BackupMigrateQuickBackupTest.php b/tests/src/Functional/BackupMigrateQuickBackupTest.php index 447d995..5fdec3d 100644 --- a/tests/src/Functional/BackupMigrateQuickBackupTest.php +++ b/tests/src/Functional/BackupMigrateQuickBackupTest.php @@ -30,18 +30,22 @@ public function setUp() { // Ensure backup_migrate folder exists. $path = 'private://backup_migrate/'; - \Drupal::service('file_system')->prepareDirectory($path, FileSystemInterface::CREATE_DIRECTORY); - } + \Drupal::service('file_system') + ->prepareDirectory($path, FileSystemInterface::CREATE_DIRECTORY); - /** - * Tests quick backup. - */ - public function testQuickBackup() { + // Log in as an admin. $this->drupalLogin($this->drupalCreateUser([ 'perform backup', 'access backup files', 'administer backup and migrate', ])); + } + + /** + * Tests quick backup. + */ + public function testQuickBackup() { + // Load the main B&M admin page. $this->drupalGet('admin/config/development/backup_migrate'); $this->assertSession()->statusCodeEquals(200); @@ -52,6 +56,9 @@ public function testQuickBackup() { ]; $this->submitForm($data, t('Backup now')); + // Confirm that the form submitted. + $this->assertSession()->pageTextContains('Backup Complete.'); + // Get backups page. $this->drupalGet('admin/config/development/backup_migrate/backups'); $this->assertSession()->statusCodeEquals(200);