Added extended tests for sample data

Author: paliarush

Diff for: .travis.yml

@@ -28,10 +28,13 @@ before_script:
   - cat ./scripts/host/k_rebuild_environment.sh
   - cat ./init_project.sh
   - cat ./etc/config.yaml.dist
+  - cat ./etc/helm/values.yaml
+  - cat ./tests/_files/*
+  - cat ./scripts/host/get_path_to_php.sh
 
 script:
   # Run DevBox tests
-  - cd ./tests && sudo bash ./run-tests-on-travis.sh && cd ..
+  - travis_wait 30 sudo bash ./tests/run-tests-on-travis.sh
 
 after_script:
   - sudo kubectl describe pods

Diff for: etc/helm/values.yaml

@@ -43,8 +43,8 @@ global:
     volumeHostPath: /Users/user/Projects/magento2-kubernetes-for-developers
   persistence:
     nfs:
-      enabled: true # NFS Status
-      serverIp: 192.168.99.1
+      enabled: true # This value is overridden via <devbox_project>/etc/config.yaml
+      serverIp: 192.168.99.1 # This value is overridden via <devbox_project>/etc/config.yaml
 
 resources: {}
   # Uncomment the following

Diff for: scripts/host/configure_ubuntu_travis.sh

@@ -6,9 +6,11 @@ cd "${devbox_dir}"
 sudo ./scripts/host/configure_nfs_exports.sh
 cp ./tests/include/configuration.sh.dist ./tests/include/configuration.sh
 sed -i "s|git@github.com:|https://github.com/|g" ./etc/config.yaml.dist
+sed -i "s|git@github.com:|https://github.com/|g" ./tests/_files/*
+sed -i "s|php_executable=\"php\"|php_executable=\"\$HOME/.phpenv/shims/php\"|g" ./scripts/host/get_path_to_php.sh
+# TODO: Make configurable and enable for specific tests
+# sed -i "s|git clone|git clone --depth 1 |g" ./init_project.sh
 sed -i "s|minikube start --cpus=2 --memory=4096|sudo minikube start --cpus=2 --memory=4096  --vm-driver=none --bootstrapper=kubeadm --kubernetes-version=v1.13.0|g" ./init_project.sh
-sed -i "s|git clone|git clone --depth 1 |g" ./init_project.sh
 sed -i "s|&& eval \$(minikube docker-env) ||g" ./scripts/host/k_rebuild_environment.sh
 sed -i "s/use_nfs:\ 1/use_nfs:\ 0/g" ./etc/config.yaml.dist
-sed -i "s/enabled:\ true \# NFS Status/enabled:\ false \# NFS Status/g" ./etc/helm/values.yaml
 sed -i "s/nfs_server_ip:\ \"0\.0\.0\.0\"/nfs_server_ip:\ \"$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+')\"/g" ./etc/config.yaml.dist

Diff for: tests/_files/ce23_with_sample_data_mysql_search_no_nfs_config.yaml

@@ -0,0 +1,70 @@
+# [To apply changes: init_project.sh -fc] Possible values: git, composer
+checkout_source_from: "git"
+
+composer_project:
+  # Current section used only if 'checkout_source_from' is set to 'composer'
+
+  # [To apply changes: init_project.sh -fc]
+  # Custom version can be provided by using '={version}' appended to repo name. E.g. name: "magento/project-community-edition=2.2.0". Otherwise, default version is used
+  name: "magento/project-community-edition"
+  # Make sure to specify valid keys for this repository in etc/composer/auth.json
+  url: "https://repo.magento.com"
+
+repository_url:
+  # Current section used only if 'checkout_source_from' is set to 'git'
+
+  # [To apply changes: init_project.sh -fc]
+  # git@github.com:magento/magento2ce.git OR custom one. Use '::' to specify a specific branch, e.g: git@github.com:magento/magento2.git::2.1
+  ce: "git@github.com:magento/magento2.git::2.3"
+  # git@github.com:magento/magento2ee.git OR custom one
+  ee: ""
+  # can be replaced with custom repository. Use '::' to specify a specific branch, e.g: git@github.com:magento/magento2-sample-data.git::2.1-develop
+  ce_sample_data: "git@github.com:magento/magento2-sample-data.git::2.3"
+  # git@github.com:magento/magento2-sample-data-ee.git OR custom one
+  ee_sample_data: ""
+
+guest:
+  # [To apply changes: init_project.sh -f] NFS will be used for folder synchronization on *nix and OSX hosts by default.
+  use_nfs: 0
+  # [To apply changes: init_project.sh -f] The placeholder IP will be replaced with auto-detected value, unless modified manually before execution of "init_project.sh" script.
+  nfs_server_ip: "0.0.0.0"
+  # [To apply changes: devbox reload] Default is 2Gb, around 3Gb is necessary to run functional tests.
+  memory: 2048
+  # Recommended number of CPUs is 2
+  cpus: 1
+  ip_address: "192.168.10.2"
+  forwarded_ssh_port: 3000
+
+environment:
+  # [To apply changes: devbox reload] Valid versions: 5.6, 7.0, 7.1, 7.2
+  php_version: "7.0"
+  composer_prefer_source: 0
+  # [To apply changes: m-reinstall OR m-varnish enable/disable]
+  use_varnish: 0
+  # [To apply changes: m-reinstall] Possible values: mysql, elasticsearch
+  search_engine: "mysql"
+
+magento:
+  # [To apply changes: m-switch-to-ce -f OR m-switch-to-ee -f]
+  install_sample_data: 1
+  # [To apply changes: m-switch-to-ce -f OR m-switch-to-ee -f] Generate customer (customer@example.com:123123qQ), category, simple product, configurable product after successful Magento installation
+  generate_basic_data: 1
+  # [To apply changes: init_project.sh -f]
+  host_name: "magento2.devbox2"
+  # [To apply changes: m-reinstall]
+  admin_frontname: "admin"
+  language: "en_US"
+  timezone: "America/Chicago"
+  currency: "USD"
+  admin_user: "admin"
+  admin_password: "123123q"
+  # [Changes applied on m-clear-cache] Available options: developer, production, default
+  mode: "developer"
+
+debug:
+  # [Changes applied on m-clear-cache] Enable template path and block name hints on storefront
+  magento_storefront: 0
+  # [Changes applied on m-clear-cache] Enable template path hints in the admin panel
+  magento_admin: 0
+  # [Changes applied immediately] Enable detailed output from all scripts provided by current devbox project
+  devbox_project: 0

Diff for: tests/include/assertions.sh

@@ -12,6 +12,8 @@ function executeBasicCommonAssertions()
 
 function executeExtendedCommonAssertions()
 {
+    assertTestsConfigured
+    assertDebugConfigurationWork
     # TODO: Implement functionality and uncomment assertions
 #    assertPhpStormConfigured
 

Diff for: tests/include/global_variables.sh

@@ -11,6 +11,8 @@ current_config_name=""
 current_codebase=""
 current_magento_base_url=""
 
+export SHUNIT_COLOR="always"
+
 # Colors for CLI output
 bold=$(tput bold)
 green=$(tput setaf 2)

Diff for: tests/run-tests-on-travis.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
 set -e
 
+cd ./tests
+
 echo "# Running Basic test suite"
 bash ./testsuite-basic.sh
 if [[ "${TRAVIS_EVENT_TYPE}" = "cron" ]] || [[ "${RUN_EXTENDED_TEST_SUITE}" = "true" ]]; then
     echo '# Running extended test suite'
     bash ./testsuite-extended.sh
 fi
+
+cd ..

Diff for: tests/testsuite-basic.sh

@@ -60,11 +60,7 @@ function testNoCustomConfigBasicTest()
     executeBasicCommonAssertions
     assertMagentoEditionIsCE
     assertCeSampleDataNotInstalled
-    assertTestsConfigured
-    assertDebugConfigurationWork
     assertRedisCacheIsEnabled
-
-#    executeExtendedCommonAssertions
 }
 
 ## Call and Run all Tests

Diff for: tests/testsuite-extended.sh

@@ -51,17 +51,24 @@ See logs in ${logs_dir}"
 
 ## Tests
 
-function testNoCustomConfigExtendedTest()
+function testCe23WithSampleDataMysqlSearchNoNfs()
 {
-    current_config_name="no_custom_config"
-    current_codebase="ce"
+    current_config_name="ce23_with_sample_data_mysql_search_no_nfs"
+    current_codebase="ce23_with_sample_data"
+
     installEnvironment
-#    assertVarnishDisabled
+
+    assertSourceCodeIsFromBranch "${devbox_dir}/magento" "2.3"
+    assertSourceCodeIsFromBranch "${devbox_dir}/magento/magento2ce-sample-data" "2.3"
+
     executeBasicCommonAssertions
+    assertCeSampleDataInstalled
     assertMagentoEditionIsCE
-    assertCeSampleDataNotInstalled
-    assertTestsConfigured
-    assertDebugConfigurationWork
+
+    assertElasticSearchDisabled
+    assertSearchWorks
+    assertElasticSearchEnablingWorks
+
     assertRedisCacheIsEnabled
 
     executeExtendedCommonAssertions