Add submodules to CI testing (#749)

* Add submodules to CI testing * Forgot a quote * Fixing tests
Islandora · Dec 19, 2019 · 20477e8 · 20477e8
1 parent b553f2c
commit 20477e8
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,6 +38,10 @@ script:
   - $SCRIPT_DIR/travis_scripts.sh
   - $SCRIPT_DIR/run-tests.sh "islandora"
   - $SCRIPT_DIR/run-tests.sh "islandora_breadcrumbs"
+  - $SCRIPT_DIR/run-tests.sh "islandora_image"
+  - $SCRIPT_DIR/run-tests.sh "islandora_audio"
+  - $SCRIPT_DIR/run-tests.sh "islandora_video"
+  - $SCRIPT_DIR/run-tests.sh "islandora_text_extraction"
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

diff --git a/...io/config/schema/islandora_audio.info.yml → .../config/schema/islandora_audio.schema.yml b/...io/config/schema/islandora_audio.info.yml → .../config/schema/islandora_audio.schema.yml
@@ -8,6 +8,9 @@ action.configuration.generate_audio_derivative:
     event:
       type: text
       label: 'Event Type'
+    destination_media_type:
+      type: text
+      label: 'Destination media type'
     source_term_uri:
       type: text
       label: 'Source term uri'

diff --git a/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php b/modules/islandora_audio/tests/src/Functional/GenerateAudioDerivativeTest.php
@@ -46,6 +46,7 @@ public function testGenerateAudioDerivativeFromScratch() {
     $this->getSession()->getPage()->fillField('edit-label', "Generate audio test derivative");
     $this->getSession()->getPage()->fillField('edit-id', "generate_audio_test_derivative");
     $this->getSession()->getPage()->fillField('edit-queue', "generate-audio-test-derivative");
+    $this->getSession()->getPage()->fillField('edit-destination-media-type', $this->testMediaType->label());
     $this->getSession()->getPage()->fillField("edit-source-term", $this->preservationMasterTerm->label());
     $this->getSession()->getPage()->fillField("edit-derivative-term", $this->serviceFileTerm->label());
     $this->getSession()->getPage()->fillField('edit-mimetype', "audio/mpeg");

diff --git a/...ge/config/schema/islandora_image.info.yml → .../config/schema/islandora_image.schema.yml b/...ge/config/schema/islandora_image.info.yml → .../config/schema/islandora_image.schema.yml
@@ -8,6 +8,9 @@ action.configuration.generate_image_derivative:
     event:
       type: text
       label: 'Event Type'
+    destination_media_type:
+      type: text
+      label: 'Destination media type'
     source_term_uri:
       type: text
       label: 'Source term uri'

diff --git a/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php b/modules/islandora_image/tests/src/Functional/GenerateImageDerivativeTest.php
@@ -48,6 +48,7 @@ public function testGenerateImageDerivativeFromScratch() {
     $this->getSession()->getPage()->fillField('edit-label', "Generate image test derivative");
     $this->getSession()->getPage()->fillField('edit-id', "generate_image_test_derivative");
     $this->getSession()->getPage()->fillField('edit-queue', "generate-image-test-derivative");
+    $this->getSession()->getPage()->fillField('edit-destination-media-type', $this->testMediaType->label());
     $this->getSession()->getPage()->fillField("edit-source-term", $this->preservationMasterTerm->label());
     $this->getSession()->getPage()->fillField("edit-derivative-term", $this->serviceFileTerm->label());
     $this->getSession()->getPage()->fillField('edit-mimetype', "image/jpeg");

diff --git a/modules/islandora_text_extraction/islandora_text_extraction.install b/modules/islandora_text_extraction/islandora_text_extraction.install
diff --git a/modules/islandora_text_extraction/tests/src/Functional/LoadTest.php b/modules/islandora_text_extraction/tests/src/Functional/LoadTest.php
@@ -3,14 +3,14 @@
 namespace Drupal\Tests\islandora_text_extraction\Functional;
 
 use Drupal\Core\Url;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\islandora\Functional\IslandoraFunctionalTestBase;
 
 /**
  * Simple test to ensure that main page loads with module enabled.
  *
  * @group islandora_text_extraction
  */
-class LoadTest extends BrowserTestBase {
+class LoadTest extends IslandoraFunctionalTestBase {
 
   /**
    * Modules to enable.
@@ -29,7 +29,7 @@ class LoadTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  public function setUp() {
     parent::setUp();
     $this->user = $this->drupalCreateUser(['administer site configuration']);
     $this->drupalLogin($this->user);

diff --git a/...eo/config/schema/islandora_video.info.yml → .../config/schema/islandora_video.schema.yml b/...eo/config/schema/islandora_video.info.yml → .../config/schema/islandora_video.schema.yml
@@ -8,6 +8,9 @@ action.configuration.generate_video_derivative:
     event:
       type: text
       label: 'Event Type'
+    destination_media_type:
+      type: text
+      label: 'Destination media type'
     source_term_uri:
       type: text
       label: 'Source term uri'

diff --git a/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php b/modules/islandora_video/tests/src/Functional/GenerateVideoDerivativeTest.php
@@ -19,10 +19,7 @@ class GenerateVideoDerivativeTest extends GenerateDerivativeTestBase {
   /**
    * @covers \Drupal\islandora_video\Plugin\Action\GenerateVideoDerivative::defaultConfiguration
    * @covers \Drupal\islandora_video\Plugin\Action\GenerateVideoDerivative::buildConfigurationForm
-   * @covers \Drupal\islandora\Plugin\Action\AbstractGenerateDerivative::defaultConfiguration
-   * @covers \Drupal\islandora\Plugin\Action\AbstractGenerateDerivative::buildConfigurationForm
-   * @covers \Drupal\islandora\Plugin\Action\AbstractGenerateDerivative::submitConfigurationForm
-   * @covers \Drupal\islandora\Plugin\Action\AbstractGenerateDerivative::execute
+   * @covers \Drupal\islandora_video\Plugin\Action\GenerateVideoDerivative::validateConfigurationForm
    */
   public function testGenerateVideoDerivativeFromScratch() {
 
@@ -46,6 +43,7 @@ public function testGenerateVideoDerivativeFromScratch() {
     $this->getSession()->getPage()->fillField('edit-label', "Generate video test derivative");
     $this->getSession()->getPage()->fillField('edit-id', "generate_video_test_derivative");
     $this->getSession()->getPage()->fillField('edit-queue', "generate-video-test-derivative");
+    $this->getSession()->getPage()->fillField('edit-destination-media-type', $this->testMediaType->label());
     $this->getSession()->getPage()->fillField("edit-source-term", $this->preservationMasterTerm->label());
     $this->getSession()->getPage()->fillField("edit-derivative-term", $this->serviceFileTerm->label());
     $this->getSession()->getPage()->fillField('edit-mimetype', "video/mp4");

diff --git a/src/Form/IslandoraSettingsForm.php b/src/Form/IslandoraSettingsForm.php
@@ -104,8 +104,8 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form[self::FEDORA_URL] = [
       '#type' => 'textfield',
       '#title' => $this->t('Fedora URL'),
-      '#attributes' => array('readonly' => 'readonly'),
-      '#default_value' => t($fedora_url),
+      '#attributes' => ['readonly' => 'readonly'],
+      '#default_value' => $fedora_url,
     ];
 
     $selected_bundles = $config->get(self::GEMINI_PSEUDO);