diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e92ea5b7..9946a34b4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,7 +145,7 @@ commands: cd /var/www/html/test/ sudo chmod 775 . sudo chown www-data:circleci . - git clone --branch '9.1.x' https://github.com/vardot/varbase.git /var/www/html/test/varbase-code + git clone --branch '10.0.x' https://github.com/vardot/varbase.git /var/www/html/test/varbase-code cp -r /var/www/html/test/varbase-code /var/www/html/test/varbase cd /var/www/html/test/varbase composer install --no-interaction -vvv @@ -295,24 +295,24 @@ workflows: - varbase-testing-01-website-base-requirements: filters: tags: - only: /^9.1.*/ + only: /^10.0.*/ branches: - only: /^9.1.x/ + only: /^10.0.x/ - varbase-testing-02-user-management-03-admin-management: filters: tags: - only: /^9.1.*/ + only: /^10.0.*/ branches: - only: /^9.1.x/ + only: /^10.0.x/ - varbase-testing-04-content-structure: filters: tags: - only: /^9.1.*/ + only: /^10.0.*/ branches: - only: /^9.1.x/ + only: /^10.0.x/ - varbase-testing-05-content-management: filters: tags: - only: /^9.1.*/ + only: /^10.0.*/ branches: - only: /^9.1.x/ + only: /^10.0.x/ diff --git a/README.md b/README.md index ccc2f3c53..64e48f682 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Vardot](https://circleci.com/gh/Vardot/varbase/tree/9.1.x.svg?style=shield)](https://app.circleci.com/pipelines/github/Vardot/varbase?branch=9.1.x) Varbase 9.1.x +[![Vardot](https://circleci.com/gh/Vardot/varbase/tree/10.0.x.svg?style=shield)](https://app.circleci.com/pipelines/github/Vardot/varbase?branch=10.0.x) Varbase 10.0.x [![](https://www.drupal.org/files/styles/grid-3/public/project-images/Medium-Logo%20Color%20with%20padding.png)](https://www.drupal.org/project/varbase) @@ -19,8 +19,8 @@ in every project. * Comes with a lot of needed functionalities/modules for every-day Drupal site. * [Tested, tested, and tested.](https://app.circleci.com/pipelines/github/Vardot/varbase) -Starting a new project? Consider Varbase for Drupal 9. -Installing Varbase 9.1.x comes with several extra automated installation +Starting a new project? Consider Varbase for Drupal 10. +Installing Varbase 10.0.x comes with several extra automated installation steps, to take full advantage of Varbase, other than the Drupal 9 installation instructions. @@ -28,26 +28,26 @@ instructions. # Install with Composer -To install the dev version of Varbase 9.1.x run this command: +To install the dev version of Varbase 10.0.x run this command: ``` -composer create-project vardot/varbase-project:9.1.x-dev PROJECT_DIR_NAME --stability dev --no-interaction +composer create-project vardot/varbase-project:10.0.x-dev PROJECT_DIR_NAME --stability dev --no-interaction ``` -## [Create a new Vartheme sub theme for a project](https://github.com/Vardot/varbase/tree/9.1.x/scripts/README.md) +## [Create a new Vartheme sub theme for a project](https://github.com/Vardot/varbase/tree/10.0.x/scripts/README.md) -## [Automated Functional Testing](https://github.com/Vardot/varbase/blob/9.1.x/tests/README.md) +## [Automated Functional Testing](https://github.com/Vardot/varbase/blob/10.0.x/tests/README.md) -## [Varbase 9.1.x Developer Guide](https://docs.varbase.vardot.com) +## [Varbase 10.0.x Developer Guide](https://docs.varbase.vardot.com) -## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/9.1.x/CHANGELOG.md) +## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/10.0.x/CHANGELOG.md) -## [Varbase Gherkin features](https://github.com/Vardot/varbase/blob/9.1.x/tests/features/varbase/README.md) +## [Varbase Gherkin features](https://github.com/Vardot/varbase/blob/10.0.x/tests/features/varbase/README.md) ## [Varbase Developer Guide](https://docs.varbase.vardot.com) -## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/9.1.x/CHANGELOG.md) +## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/10.0.x/CHANGELOG.md) -## [General instructions on how to update Varbase](https://github.com/Vardot/varbase/blob/9.1.x/UPDATE.md) +## [General instructions on how to update Varbase](https://github.com/Vardot/varbase/blob/10.0.x/UPDATE.md) ## Local development with Lando diff --git a/UPDATE.md b/UPDATE.md index 8c47150a6..7027f5ba8 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -58,13 +58,13 @@ At the end of the update process, two log files are useful to troubleshoot 2. Edit your _composer.json_ file to be ready for updates. You have two choices. Edit your _composer.json_ to include all the new updates made in - [varbase-project](https://github.com/Vardot/varbase-project/blob/9.1.x/composer.json). + [varbase-project](https://github.com/Vardot/varbase-project/blob/10.0.x/composer.json). This includes the new components required and its versions _"require"_, _"repositories"_, _"extra"_, and any other important config. You can use a diff tool such as [Meld](http://meldmerge.org/) or [DiffMerge](https://sourcegear.com/diffmerge/) to help you diff between your old _composer.json_ and the new one from - [varbase-project](https://github.com/Vardot/varbase-project/blob/9.1.x/composer.json). + [varbase-project](https://github.com/Vardot/varbase-project/blob/10.0.x/composer.json). 3. Back up your code and database 4. Execute Composer update to download updates to modules and libraries. `composer update` diff --git a/composer.json b/composer.json index 637df8c1e..797f81987 100644 --- a/composer.json +++ b/composer.json @@ -31,26 +31,26 @@ "oomphinc/composer-installers-extender": "~1.0 || ~2.0", "cweagans/composer-patches": "~1.0", "drupal/core-composer-scaffold": "^9", - "drupal/core": "~9.0", - "drupal/varbase_core": "9.1.x-dev", - "drupal/varbase_api": "9.0.x-dev", - "drupal/varbase_media": "9.1.x-dev", - "drupal/varbase_editor": "9.1.x-dev", - "drupal/varbase_landing": "9.1.x-dev", + "drupal/core": "~9.0 || ~10", + "drupal/varbase_core": "10.0.x-dev", + "drupal/varbase_api": "10.0.x-dev", + "drupal/varbase_media": "10.0.x-dev", + "drupal/varbase_editor": "10.0.x-dev", + "drupal/varbase_landing": "10.0.x-dev", "drupal/varbase_layout_builder": "10.1.x-dev", - "drupal/varbase_bootstrap_paragraphs": "9.1.x-dev", - "drupal/varbase_heroslider_media": "9.1.x-dev", - "drupal/varbase_carousels": "9.1.x-dev", - "drupal/varbase_blog": "9.1.x-dev", - "drupal/varbase_search": "9.0.x-dev", - "drupal/varbase_seo": "9.0.x-dev", - "drupal/varbase_auth": "9.0.x-dev", - "drupal/varbase_total_control": "9.0.x-dev", - "drupal/varbase_styleguide": "9.1.x-dev", - "drupal/varbase_email": "9.1.x-dev", - "drupal/varbase_workflow": "2.0.x-dev", + "drupal/varbase_bootstrap_paragraphs": "10.0.x-dev", + "drupal/varbase_heroslider_media": "10.0.x-dev", + "drupal/varbase_carousels": "10.0.x-dev", + "drupal/varbase_blog": "10.0.x-dev", + "drupal/varbase_search": "10.0.x-dev", + "drupal/varbase_seo": "10.0.x-dev", + "drupal/varbase_auth": "10.0.x-dev", + "drupal/varbase_total_control": "10.0.x-dev", + "drupal/varbase_styleguide": "10.0.x-dev", + "drupal/varbase_email": "10.0.x-dev", + "drupal/varbase_workflow": "3.0.x-dev", "drupal/vartheme_bs5": "1.0.x-dev", - "drupal/vartheme_claro": "3.0.x-dev", + "drupal/vartheme_claro": "4.0.x-dev", "vardot/entity-definition-update-manager": "~1.0", "vardot/module-installer-factory": "~1.0", "bower-asset/objectfitpolyfill": "~2.0", @@ -113,8 +113,6 @@ } }, "branch-alias": { - "dev-9.0.x": "9.0.x-dev", - "dev-9.1.x": "9.1.x-dev", "dev-10.0.x": "10.0.x-dev" }, "installer-types": [ diff --git a/tests/README.md b/tests/README.md index 3f6b58473..ee7c16385 100644 --- a/tests/README.md +++ b/tests/README.md @@ -7,13 +7,13 @@ This page list all the steps needed, which you need to run the Behat Gherkin Features to test a varbase website in your localhost machine. -To test varbase 9.1.x in the right way you will need to build varbase using +To test varbase 10.0.x in the right way you will need to build varbase using the composer. ## Create a Varbase project with [Composer](https://getcomposer.org/download/): ``` -composer create-project vardot/varbase:9.1.x-dev PROJECT_DIR_NAME --stability dev --no-interaction +composer create-project vardot/varbase:10.0.x-dev PROJECT_DIR_NAME --stability dev --no-interaction ``` ### Add needed testing packages diff --git a/tests/tools/install-varbase/README.md b/tests/tools/install-varbase/README.md deleted file mode 100644 index cc5f34ebd..000000000 --- a/tests/tools/install-varbase/README.md +++ /dev/null @@ -1,48 +0,0 @@ -A list of Gherkin features, which help in the Default installation to initiate -a site for a client, As an Application site Builders, they will be able to -install Varbase for a selected client, So that they will be able to initiate -the site with the default installation. - -If you want to test the installation process feature, you will need to use the - varbase Install config file, as you can see in the following command. - - -``` -$ bin/behat --config=behat.varbase-install.yml tools/install-varbase/multilingual-installation.feature -``` -equivalent to: - -``` -drush site-install varbase --yes --site-name=Varbase4 --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url=mysql://root:123___@localhost/test_varbase4 --locale=en varbase_multilingual_configuration.enable_multilingual=true -vvv -``` -- - -``` -$ bin/behat --config=behat.varbase-install.yml tools/install-varbase/default-installation.feature -``` -equivalent to: -``` -drush site-install varbase --yes --site-name=Varbase4 --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url=mysql://root:123___@localhost/test_varbase4 --locale=en varbase_multilingual_configuration.enable_multilingual=false -vvv -``` - - -- - -``` -$ bin/behat --config=behat.varbase-install.yml tools/install-varbase/english-language-installation.feature -``` -equivalent to: -``` -drush site-install varbase --yes --site-name=Varbase4 --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url=mysql://root:123___@localhost/test_varbase4 --locale=en varbase_multilingual_configuration.enable_multilingual=false -vvv -``` - - -- - -``` -$ bin/behat --config=behat.varbase-install.yml tools/install-varbase/arabic-installation.feature -``` -equivalent to: -``` -drush site-install varbase --yes --site-name=Varbase4 --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url=mysql://root:123___@localhost/test_varbase4 --locale=ar varbase_multilingual_configuration.enable_multilingual=false -vvv -``` diff --git a/tests/tools/install-varbase/arabic-installation.feature b/tests/tools/install-varbase/arabic-installation.feature deleted file mode 100644 index 4245de1e7..000000000 --- a/tests/tools/install-varbase/arabic-installation.feature +++ /dev/null @@ -1,38 +0,0 @@ -Feature: Installation - Varbase - Arabic installation. -As an Application site Builder -I want to be able to install Varbase for a selected client -So that I will be able to initiate the site with the default installation - - @javascript @tools @install @local @development - Scenario: Arabic installation for Varbase 9.1.x - Given I go to "/core/install.php" - And I wait - Then I should see "Choose language" - When I select "ar" from "langcode" - And I press "Save and continue" - And I wait - Then I should see "إعدادات قاعدة البيانات" - When I fill in "test_varbase4" for "mysql[database]" - And I fill in "root" for "mysql[username]" - And I fill in "123___" for "mysql[password]" - And I press "حفظ ومتابعة" - And I wait for the batch job to finish - Then I should see "ضبط الموقع" - And I wait - When I fill in "موقع عربي" for "اسم الموقع" - # And I fill in "noreply@vardot.com" for "Site email address" - # And I fill in "webmaster" for "اسم المستخدم" - And I fill in "dD.123123ddd" for "كلمة المرور" - And I fill in "dD.123123ddd" for "تأكيد كلمة المرور" - # And I fill in "عنوان البريد الإلكتروني" with "webmaster@vardot.com" - And I uncheck the box "Check for updates automatically" - And I press "حفظ ومتابعة" - And I wait for the batch job to finish - Then I should see "Multilingual configuration" - When I press "حفظ ومتابعة" - And I wait for the batch job to finish - Then I should see "Extra components" - When I check the box "Varbase development" - And I press "حفظ ومتابعة" - And I wait for the batch job to finish - Then I should see "Welcome to موقع عربي" diff --git a/tests/tools/install-varbase/default-installation.feature b/tests/tools/install-varbase/default-installation.feature deleted file mode 100644 index 114cc29d6..000000000 --- a/tests/tools/install-varbase/default-installation.feature +++ /dev/null @@ -1,35 +0,0 @@ -Feature: Installation - Varbase - Default installation. -As an Application site Builder -I want to be able to install Varbase for a selected client -So that I will be able to initiate the site with the default installation - - @javascript @tools @install @local @development - Scenario: Default installation for Varbase 9.1.x - Given I go to "/core/install.php" - And I wait - Then I should see "Choose language" - When I press "Save and continue" - And I wait - Then I should see "Database configuration" - When I fill in "test_varbase4" for "Database name" - And I fill in "root" for "Database username" - And I fill in "123___" for "Database password" - And I press "Save and continue" - And I wait for the batch job to finish - Then I should see "Configure site" - When I fill in "Site name" with "Varbase4" - # And I fill in "Site email address" with "noreply@vardot.com" - # And I fill in "Username" with "webmaster" - And I fill in "Password" with "dD.123123" - And I fill in "Confirm password" with "dD.123123" - # And I fill in "Email address" with "webmaster@vardot.com" - And I uncheck the box "Check for updates automatically" - And I press "Save and continue" - And I wait for the batch job to finish - Then I should see "Multilingual configuration" - When I press "Save and continue" - And I wait for the batch job to finish - Then I should see "Extra components" - When I press "Save and continue" - And I wait for the batch job to finish - Then I should see "Welcome to Varbase4" diff --git a/tests/tools/install-varbase/english-language-installation.feature b/tests/tools/install-varbase/english-language-installation.feature deleted file mode 100644 index 4e53f0035..000000000 --- a/tests/tools/install-varbase/english-language-installation.feature +++ /dev/null @@ -1,40 +0,0 @@ -Feature: Installation - Varbase - English installation. -As an Application site Builder -I want to be able to install Varbase for a selected client -So that I will be able to initiate the site with the default installation - - @javascript @tools @install @local @development - Scenario: English installation for Varbase 9.1.x - Given I go to "/core/install.php" - And I wait - Then I should see "Choose language" - When I select "en" from "langcode" - And I press "Save and continue" - And I wait - Then I should see "Database configuration" - When I fill in "test_varbase4" for "Database name" - And I fill in "root" for "Database username" - And I fill in "123___" for "Database password" - And I press "Save and continue" - And I wait for the batch job to finish - Then I should see "Configure site" - And I wait - When I fill in "Site name" with "Varbase4" - # And I fill in "Site email address" with "noreply@vardot.com" - # And I fill in "Username" with "webmaster" - And I fill in "Password" with "dD.123123" - And I fill in "Confirm password" with "dD.123123" - # And I fill in "Email address" with "webmaster@vardot.com" - And I uncheck the box "Check for updates automatically" - And I press "Save and continue" - And I wait for the batch job to finish - Then I should see "Multilingual configuration" - When I check the box "Enable multiple languages for this site" - Then I should see "Please select your site's other language(s)" - When I press "Save and continue" - And I wait for the batch job to finish - Then I should see "Extra components" - When I check the box "Varbase development" - When I press "Save and continue" - And I wait for the batch job to finish - Then I should see "Welcome to Varbase4" diff --git a/tests/tools/install-varbase/multilingual-installation.feature b/tests/tools/install-varbase/multilingual-installation.feature deleted file mode 100644 index 31642176c..000000000 --- a/tests/tools/install-varbase/multilingual-installation.feature +++ /dev/null @@ -1,41 +0,0 @@ -Feature: Installation - Varbase - Multilingual installation. -As an Application site Builder -I want to be able to install Varbase for a selected client -So that I will be able to initiate the site with the default installation - - @javascript @tools @install @local @development - Scenario: Multilingual installation for Varbase 9.1.x - Given I go to "/core/install.php" - And I wait - Then I should see "Choose language" - When I select "en" from "langcode" - And I press "Save and continue" - And I wait - Then I should see "Database configuration" - When I fill in "test_varbase4" for "Database name" - And I fill in "root" for "Database username" - And I fill in "123___" for "Database password" - And I press "Save and continue" - And I wait for the batch job to finish - Then I should see "Configure site" - When I fill in "Site name" with "Varbase4" - # And I fill in "Site email address" with "noreply@vardot.com" - # And I fill in "Username" with "webmaster" - And I fill in "Password" with "dD.123123" - And I fill in "Confirm password" with "dD.123123" - # And I fill in "Email address" with "webmaster@vardot.com" - And I uncheck the box "Check for updates automatically" - And I press "Save and continue" - And I wait for the batch job to finish - Then I should see "Multilingual configuration" - When I check the box "Enable multiple languages for this site" - Then I should see "Please select your site's other language(s)" - When I select "ar" from "multilingual_languages[]" - And I select "fr" from "multilingual_languages[]" - When I press "Save and continue" - And I wait for the batch job to finish - Then I should see "Extra components" - When I check the box "Varbase development" - When I press "Save and continue" - And I wait for the batch job to finish - Then I should see "Welcome to Varbase4" diff --git a/tests/tools/languages/README.md b/tests/tools/languages/README.md deleted file mode 100644 index 05c486365..000000000 --- a/tests/tools/languages/README.md +++ /dev/null @@ -1,13 +0,0 @@ -A list of Gherkin features, which help in adding and deleting languages in the -site. so that other testing scenarios will work in the full test. - -If you want to test the any of the tools features, you will need to use the - varbase tools config file, as you can see in the following command. - -$ bin/behat --config=behat.varbase-tools.yml tools/languages/add-arabic.feature - -$ bin/behat --config=behat.varbase-tools.yml tools/languages/add-arabic.feature - -$ bin/behat --config=behat.varbase-tools.yml tools/languages/delete-arabic.feature - -$ bin/behat --config=behat.varbase-tools.yml tools/languages/delete-french.feature diff --git a/tests/tools/languages/add-arabic.feature b/tests/tools/languages/add-arabic.feature deleted file mode 100644 index dfa95b504..000000000 --- a/tests/tools/languages/add-arabic.feature +++ /dev/null @@ -1,20 +0,0 @@ -Feature: Add Arabic language if we do not have it to languages in the system. - - @javascript @init @tools @local @development @staging @arabic - Scenario: Add Arabic language if we do not have it to languages in the system. - Given I am a logged in user with the "webmaster" user - When I go to "/admin/config/regional/language" - And I wait - Then I should not see "Arabic" - But I should see "Add language" - When I click "Add language" - And I wait - Then I should see "Add a language to be supported by your site." - When I select "ar" from "Language name" - And I press "Add language" - And I wait for the batch job to finish - Then I should see "The language Arabic has been created and can now be used." - And I wait for the batch job to finish - When I go to "/admin/config/regional/language" - And I wait - Then I should see "Arabic" diff --git a/tests/tools/languages/add-french.feature b/tests/tools/languages/add-french.feature deleted file mode 100644 index 45e8c575f..000000000 --- a/tests/tools/languages/add-french.feature +++ /dev/null @@ -1,20 +0,0 @@ -Feature: Add French language if we do not have it to languages in the system. - - @javascript @init @tools @local @development @staging @french - Scenario: Add French language if we do not have it to languages in the system. - Given I am a logged in user with the "webmaster" user - When I go to "/admin/config/regional/language" - And I wait - Then I should not see "French" - But I should see "Add language" - When I click "Add language" - And I wait - Then I should see "Add a language to be supported by your site." - When I select "fr" from "Language name" - And I press "Add language" - And I wait for the batch job to finish - Then I should see "The language French has been created and can now be used." - And I wait for the batch job to finish - When I go to "/admin/config/regional/language" - And I wait - Then I should see "French" diff --git a/tests/tools/languages/delete-arabic.feature b/tests/tools/languages/delete-arabic.feature deleted file mode 100644 index fc3c1c597..000000000 --- a/tests/tools/languages/delete-arabic.feature +++ /dev/null @@ -1,11 +0,0 @@ -Feature: Delete Arabic language from the system. - - @cleanup @arabic @local - Scenario: Delete Arabic language from the system. - Given I am a logged in user with the "webmaster" user - When I go to "/admin/config/regional/language/delete/ar" - And I wait - Then I should see "Are you sure you want to delete the language Arabic?" - When I press "Delete" - And I wait - Then I should see "The Arabic (ar) language has been removed." diff --git a/tests/tools/languages/delete-french.feature b/tests/tools/languages/delete-french.feature deleted file mode 100644 index 6c88cbd76..000000000 --- a/tests/tools/languages/delete-french.feature +++ /dev/null @@ -1,11 +0,0 @@ -Feature: Delete French language from the system. - - @cleanup @tools @feanch @local - Scenario: Delete French language from the system. - Given I am a logged in user with the "webmaster" user - When I go to "/admin/config/regional/language/delete/fr" - And I wait - Then I should see "Are you sure you want to delete the language French?" - When I press "Delete" - And I wait - Then I should see "The French (fr) language has been removed." diff --git a/tests/tools/users/README.md b/tests/tools/users/README.md deleted file mode 100644 index 09711de15..000000000 --- a/tests/tools/users/README.md +++ /dev/null @@ -1,9 +0,0 @@ -A list of Gherkin features, which help in adding and deleting of the default -testing users. so that they will be used on the full testing features. - -If you want to test the any of the tools features, you will need to use the - varbase tools config file, as you can see in the following command. - -$ bin/behat --config=behat.varbase-tools.yml tools/users/create-default-testing-users.feature - -$ bin/behat --config=behat.varbase-tools.yml tools/users/delete-default-testing-users.feature diff --git a/varbase.info.yml b/varbase.info.yml index b980c6f65..c63e8fda2 100755 --- a/varbase.info.yml +++ b/varbase.info.yml @@ -7,7 +7,7 @@ distribution: name: Varbase install: theme: vartheme_claro -version: 9.1.x-dev +version: 10.0.x-dev install: - system - action