From 43814238628952d973241329c53ad623e7580a2f Mon Sep 17 00:00:00 2001 From: Peter Ivanov Date: Mon, 14 Feb 2022 11:30:58 +0200 Subject: [PATCH 1/2] update --- composer.json | 4 ++-- composer.lock | 47 ++++++++++++++++++++++++++--------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index bcd002c7a02..d9e0a7b9dc4 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "repositories": [ { "type": "composer", - "url": "https://packages.microweberapi.com/" + "url": "https://market.microweberapi.com/packages/microweber/packages.json" } ], "require": { @@ -68,7 +68,7 @@ "finlet/flexmail": "dev-master", "league/csv": "^9.0@dev", "paragonie/random_compat": "^1.0|^2.0|9.99.99", - "microweber-templates/new-world": "4.0", + "microweber-templates/new-world": "4.1", "microweber-templates/shopmag": "3.0", "lcobucci/jwt": "*", "laravel/passport": "*", diff --git a/composer.lock b/composer.lock index b01739a08e9..c9d2844af95 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5666504e93acd8cf4443f6772b3db813", + "content-hash": "4ac7a9d1bd4823adab5f9de27434b962", "packages": [ { "name": "arcanedev/php-html", @@ -5625,40 +5625,41 @@ }, { "name": "microweber-templates/new-world", - "version": "4.0", + "version": "4.1", "target-dir": "new-world", "source": { "type": "git", - "url": "git@github.com:microweber-templates/new-world.git", - "reference": "cd4f8f1961c76a00595989291460867c39615578" + "url": "https://github.com/microweber-templates/new-world.git", + "reference": "e52373b25095c2a0f2f35b1c163986f267853292" }, "dist": { "type": "zip", - "url": "https://packages.microweberapi.com/domains/packages.microweberapi.com/dist/microweber-templates/new-world/microweber-templates-new-world-cd4f8f1961c76a00595989291460867c39615578-zip-5b46de.zip", - "reference": "cd4f8f1961c76a00595989291460867c39615578", - "shasum": "2840aec3ccc41024c455d4662f56dd431aa757cf" + "url": "https://market.microweberapi.com/dist/microweber-templates/new-world/microweber-templates-new-world-e52373b25095c2a0f2f35b1c163986f267853292-zip-edf420.zip", + "reference": "e52373b25095c2a0f2f35b1c163986f267853292", + "shasum": "35e1d66791f62980c1f1142ecbff128313747f45" }, "type": "microweber-template", "extra": { - "preview_url": "http://templates.microweber.com/new-world/", + "preview_url": "http://https://template.yoursite.com/new-world/", "_meta": { - "screenshot": "https://packages.microweberapi.com/domains/packages.microweberapi.com/meta/microweber-templates-new-world/40/screenshot.jpg", - "fa-brands-400": "https://packages.microweberapi.com/domains/packages.microweberapi.com/meta/microweber-templates-new-world/40/assets/fonts/fontawesome-free-5.15.4-web/webfonts/fa-brands-400.svg", - "fa-regular-400": "https://packages.microweberapi.com/domains/packages.microweberapi.com/meta/microweber-templates-new-world/40/assets/fonts/fontawesome-free-5.15.4-web/webfonts/fa-regular-400.svg", - "fa-solid-900": "https://packages.microweberapi.com/domains/packages.microweberapi.com/meta/microweber-templates-new-world/40/assets/fonts/fontawesome-free-5.15.4-web/webfonts/fa-solid-900.svg", - "slick": "https://packages.microweberapi.com/domains/packages.microweberapi.com/meta/microweber-templates-new-world/40/assets/plugins/slick/fonts/slick.svg", - "hr-line": "https://packages.microweberapi.com/domains/packages.microweberapi.com/meta/microweber-templates-new-world/40/assets/img/hr-line.svg", - "hr-vertical": "https://packages.microweberapi.com/domains/packages.microweberapi.com/meta/microweber-templates-new-world/40/assets/img/hr-vertical.svg", - "quotes": "https://packages.microweberapi.com/domains/packages.microweberapi.com/meta/microweber-templates-new-world/40/assets/img/quotes.svg", - "hr-old": "https://packages.microweberapi.com/domains/packages.microweberapi.com/meta/microweber-templates-new-world/40/assets/img/hr-old.svg", - "hr-zigzag": "https://packages.microweberapi.com/domains/packages.microweberapi.com/meta/microweber-templates-new-world/40/assets/img/hr-zigzag.svg", - "hr": "https://packages.microweberapi.com/domains/packages.microweberapi.com/meta/microweber-templates-new-world/40/assets/img/hr.svg", - "readme": "https://packages.microweberapi.com/domains/packages.microweberapi.com/meta/microweber-templates-new-world/40/readme.md" + "screenshot": "https://market.microweberapi.com/meta/microweber-templates-new-world/41/screenshot.jpg", + "fa-brands-400": "https://market.microweberapi.com/meta/microweber-templates-new-world/41/assets/fonts/fontawesome-free-5.15.4-web/webfonts/fa-brands-400.svg", + "fa-regular-400": "https://market.microweberapi.com/meta/microweber-templates-new-world/41/assets/fonts/fontawesome-free-5.15.4-web/webfonts/fa-regular-400.svg", + "fa-solid-900": "https://market.microweberapi.com/meta/microweber-templates-new-world/41/assets/fonts/fontawesome-free-5.15.4-web/webfonts/fa-solid-900.svg", + "slick": "https://market.microweberapi.com/meta/microweber-templates-new-world/41/assets/plugins/slick/fonts/slick.svg", + "hr-line": "https://market.microweberapi.com/meta/microweber-templates-new-world/41/assets/img/hr-line.svg", + "hr-vertical": "https://market.microweberapi.com/meta/microweber-templates-new-world/41/assets/img/hr-vertical.svg", + "quotes": "https://market.microweberapi.com/meta/microweber-templates-new-world/41/assets/img/quotes.svg", + "hr-old": "https://market.microweberapi.com/meta/microweber-templates-new-world/41/assets/img/hr-old.svg", + "hr-zigzag": "https://market.microweberapi.com/meta/microweber-templates-new-world/41/assets/img/hr-zigzag.svg", + "hr": "https://market.microweberapi.com/meta/microweber-templates-new-world/41/assets/img/hr.svg", + "readme": "https://market.microweberapi.com/meta/microweber-templates-new-world/41/readme.md" }, "whmcs": { "whmcs_url": "https://members.microweber.com" } }, + "notification-url": "https://market.microweberapi.com/packages/download-notify", "license": [ "MIT" ], @@ -5676,7 +5677,11 @@ "ecommerce", "microweber" ], - "time": "2021-12-07T16:26:09+00:00" + "support": { + "source": "https://github.com/microweber-templates/new-world/tree/4.1", + "issues": "https://github.com/microweber-templates/new-world/issues" + }, + "time": "2022-02-08T10:45:43+00:00" }, { "name": "microweber-templates/shopmag", From 950cd8fa3ca5971bfaa2cb5579121dfdf0ede22a Mon Sep 17 00:00:00 2001 From: Peter Ivanov Date: Mon, 14 Feb 2022 11:38:27 +0200 Subject: [PATCH 2/2] update --- .../Browser/Multilanguage/LiveEditMultilanguageTest.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/Browser/Multilanguage/LiveEditMultilanguageTest.php b/tests/Browser/Multilanguage/LiveEditMultilanguageTest.php index be94e4ce934..a13abed44ec 100644 --- a/tests/Browser/Multilanguage/LiveEditMultilanguageTest.php +++ b/tests/Browser/Multilanguage/LiveEditMultilanguageTest.php @@ -13,7 +13,6 @@ class LiveEditMultilanguageTest extends DuskTestCase { - public $siteUrl = 'http://127.0.0.1:8000/'; public function testLiveEditNewPageSave() { @@ -43,11 +42,11 @@ public function testLiveEditNewPageSave() $browser->pause(5000); $randClassForDagAndDrop = 'rand-class-' . time(); - $browser->script("$('.edit .container .mw-empty-element').addClass('$randClassForDagAndDrop')"); + $browser->script("$('.edit[rel=\"content\"][field=\"content\"]').find('div').last().addClass('$randClassForDagAndDrop')"); $browser->pause(1000); $browser->click('.' . $randClassForDagAndDrop); - $browser->type('.' . $randClassForDagAndDrop, 'This is my text on english language'); + $browser->typeSlowly('.' . $randClassForDagAndDrop, 'This is my text on english language'); $browser->click('#main-save-btn'); $browser->pause(5000); @@ -61,14 +60,14 @@ public function testLiveEditNewPageSave() $browser->pause(3000); $randClassForWrite = 'rand-class-' . time(); - $browser->script("$('.edit .mw-empty-element').addClass('$randClassForWrite')"); + $browser->script("$('.edit[rel=\"content\"][field=\"content\"]').find('div').last().addClass('$randClassForWrite')"); $browser->pause(3000); $browser->click('.' . $randClassForWrite); $browser->pause(3000); - $browser->type('.' . $randClassForWrite, 'Текст написан на български, това е българска страница'); + $browser->typeSlowly('.' . $randClassForWrite, 'Текст написан на български, това е българска страница'); $browser->click('#main-save-btn'); $browser->pause(5000);