Issue #3040605: Order of optional thunder modules install is wrong

modules/thunder_demo/thunder_demo.info.yml

@@ -6,5 +6,3 @@ core: 8.x
 dependencies:
   - better_normalizers:better_normalizers
   - default_content:default_content
-  - drupal:tour
-  - drupal:help

modules/thunder_demo/config/install/tour.tour.content-add.yml → modules/thunder_help/config/install/tour.tour.content-add.yml

@@ -2,10 +2,10 @@ langcode: en
 status: true
 dependencies:
   module:
-    - thunder_demo
+    - thunder_help
 id: content-add
 label: 'Add new content'
-module: thunder_demo
+module: thunder_help
 routes:
   -
     route_name: node.add

modules/thunder_demo/config/install/tour.tour.content-list.yml → modules/thunder_help/config/install/tour.tour.content-list.yml

@@ -2,10 +2,10 @@ langcode: en
 status: true
 dependencies:
   module:
-    - thunder_demo
+    - thunder_help
 id: content-list
 label: 'Content listing'
-module: thunder_demo
+module: thunder_help
 routes:
   -
     route_name: view.content.page_1

modules/thunder_demo/config/install/tour.tour.content-paragraphs.yml → modules/thunder_help/config/install/tour.tour.content-paragraphs.yml

@@ -2,10 +2,10 @@ langcode: en
 status: true
 dependencies:
   module:
-    - thunder_demo
+    - thunder_help
 id: content-paragraphs
 label: 'Introduction to paragraphs'
-module: thunder_demo
+module: thunder_help
 routes:
   -
     route_name: entity.node.edit_form

modules/thunder_demo/config/install/tour.tour.homepage.yml → modules/thunder_help/config/install/tour.tour.homepage.yml

@@ -2,10 +2,10 @@ langcode: en
 status: true
 dependencies:
   module:
-    - thunder_demo
+    - thunder_help
 id: homepage
 label: Homepage
-module: thunder_demo
+module: thunder_help
 routes:
   -
     route_name: view.frontpage.page_1

modules/thunder_help/thunder_help.info.yml

@@ -0,0 +1,8 @@
+name: Thunder Help
+type: module
+description: Provides a tour and some help.
+package: Thunder
+core: 8.x
+dependencies:
+  - drupal:tour
+  - drupal:help

modules/thunder_demo/thunder_demo.module → modules/thunder_help/thunder_help.module

@@ -13,7 +13,7 @@ use Drupal\Core\Entity\EntityInterface;
  * Tour depends a lot on used theme. Because of that whitelist is provided, to
  * ensure that tour is loaded only if proper theme is used.
  */
-function thunder_demo_tour_tips_alter(array &$tour_tips, EntityInterface $entity) {
+function thunder_help_tour_tips_alter(array &$tour_tips, EntityInterface $entity) {
   // Whitelist of tours for frontend and backend theme.
   $tourThemeMapping = [
     'homepage' => ['thunder_base'],

scripts/travis/04-install-thunder.sh

@@ -5,7 +5,7 @@
 install_thunder() {
     cd $1
 
-    /usr/bin/env PHP_OPTIONS="-d sendmail_path=`which true`" drush si thunder --db-url=mysql://[email protected]/drupal -y thunder_module_configure_form.install_modules_thunder_demo
+    /usr/bin/env PHP_OPTIONS="-d sendmail_path=`which true`" drush si thunder --db-url=mysql://[email protected]/drupal -y install_configure_form.demo_content
     drush en simpletest -y
 
     drush -y sql-dump --result-file=${DEPLOYMENT_DUMP_FILE}