Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'dev' of https://github.com/microweber/microweber into dev
  • Loading branch information
bobimicroweber committed Feb 14, 2022
2 parents 2876260 + 950cd8f commit acfc6a5
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 28 deletions.
4 changes: 2 additions & 2 deletions composer.json
Expand Up @@ -13,7 +13,7 @@
"repositories": [
{
"type": "composer",
"url": "https://packages.microweberapi.com/"
"url": "https://market.microweberapi.com/packages/microweber/packages.json"
}
],
"require": {
Expand Down Expand Up @@ -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": "*",
Expand Down
47 changes: 26 additions & 21 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions tests/Browser/Multilanguage/LiveEditMultilanguageTest.php
Expand Up @@ -13,7 +13,6 @@

class LiveEditMultilanguageTest extends DuskTestCase
{
public $siteUrl = 'http://127.0.0.1:8000/';

public function testLiveEditNewPageSave()
{
Expand Down Expand Up @@ -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);
Expand All @@ -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);

Expand Down

0 comments on commit acfc6a5

Please sign in to comment.