From edcc4afca8c779b34974a3c0e4486f534d419f1d Mon Sep 17 00:00:00 2001 From: "licy@guangda.work" Date: Mon, 17 Apr 2023 17:15:55 +0800 Subject: [PATCH] =?UTF-8?q?admin=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dusktest/RunnerTestCase/Run_Case.php | 28 ++++-- .../dusktest/data/admin/admin_page.php | 11 +++ .../dusktest/data/admin/cre_product.php | 11 +++ .../dusktest/data/admin/cre_product_page.php | 14 +++ tests/Browser/dusktest/data/admin/login.php | 19 ++++ .../dusktest/data/admin/login_page.php | 9 ++ .../dusktest/data/admin/product_page.php | 6 ++ .../dusktest/data/{ => catalog}/account.php | 0 .../data/{ => catalog}/account_page.php | 0 .../data/{ => catalog}/checkout_page.php | 0 .../data/{ => catalog}/index_page.php | 2 +- .../dusktest/data/{ => catalog}/login.php | 0 .../data/{ => catalog}/login_page.php | 0 .../data/{ => catalog}/order_page.php | 0 .../dusktest/data/{ => catalog}/product_1.php | 0 .../dusktest/data/{ => catalog}/register.php | 0 .../dusktest/page/admin/AddGoodsTest.php | 55 +++++++++++ .../dusktest/page/admin/AdminLoginTest.php | 93 +++++++++++++++++++ .../dusktest/page/admin/AdminSignOutTest.php | 42 +++++++++ .../dusktest/page/admin/GoCatalogTest.php | 44 +++++++++ .../Browser/dusktest/page/admin/GoVipTest.php | 38 ++++++++ .../dusktest/page/admin/GopLuginsTest.php | 38 ++++++++ .../dusktest/page/front/AddCartTest.php | 12 +-- .../dusktest/page/front/AddressTest.php | 8 +- .../dusktest/page/front/CartCheckoutTest.php | 12 +-- .../dusktest/page/front/EditUserInfo.php | 8 +- .../Browser/dusktest/page/front/LoginTest.php | 4 +- .../Browser/dusktest/page/front/OrderTest.php | 12 +-- .../dusktest/page/front/RegisterFirst.php | 4 +- .../dusktest/page/front/RegisterTest.php | 4 +- .../dusktest/page/front/RemoveCartTest.php | 12 +-- .../page/front/RemoveWishlistTest.php | 12 +-- .../dusktest/page/front/SignOutTest.php | 6 +- .../dusktest/page/front/WishlistTest.php | 13 +-- 34 files changed, 455 insertions(+), 62 deletions(-) create mode 100644 tests/Browser/dusktest/data/admin/admin_page.php create mode 100644 tests/Browser/dusktest/data/admin/cre_product.php create mode 100644 tests/Browser/dusktest/data/admin/cre_product_page.php create mode 100644 tests/Browser/dusktest/data/admin/login.php create mode 100644 tests/Browser/dusktest/data/admin/login_page.php create mode 100644 tests/Browser/dusktest/data/admin/product_page.php rename tests/Browser/dusktest/data/{ => catalog}/account.php (100%) rename tests/Browser/dusktest/data/{ => catalog}/account_page.php (100%) rename tests/Browser/dusktest/data/{ => catalog}/checkout_page.php (100%) rename tests/Browser/dusktest/data/{ => catalog}/index_page.php (98%) rename tests/Browser/dusktest/data/{ => catalog}/login.php (100%) rename tests/Browser/dusktest/data/{ => catalog}/login_page.php (100%) rename tests/Browser/dusktest/data/{ => catalog}/order_page.php (100%) rename tests/Browser/dusktest/data/{ => catalog}/product_1.php (100%) rename tests/Browser/dusktest/data/{ => catalog}/register.php (100%) create mode 100644 tests/Browser/dusktest/page/admin/AddGoodsTest.php create mode 100644 tests/Browser/dusktest/page/admin/AdminLoginTest.php create mode 100644 tests/Browser/dusktest/page/admin/AdminSignOutTest.php create mode 100644 tests/Browser/dusktest/page/admin/GoCatalogTest.php create mode 100644 tests/Browser/dusktest/page/admin/GoVipTest.php create mode 100644 tests/Browser/dusktest/page/admin/GopLuginsTest.php diff --git a/tests/Browser/dusktest/RunnerTestCase/Run_Case.php b/tests/Browser/dusktest/RunnerTestCase/Run_Case.php index 950c276e..978bc314 100644 --- a/tests/Browser/dusktest/RunnerTestCase/Run_Case.php +++ b/tests/Browser/dusktest/RunnerTestCase/Run_Case.php @@ -15,14 +15,26 @@ use PHPUnit\TextUI\DefaultResultPrinter; $suite = new TestSuite(); // 向测试套件中添加测试用例 - //1.先注册一个账户 - $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\RegisterFirst.php'); - //注册 - $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\RegisterTest.php'); - //增加地址 - $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\AddressTest.php'); - $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\LoginTest.php'); - $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\OrderTest.php'); +//后台 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\RegisterFirst.php');//先注册一个账户 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\RegisterTest.php');//场景注册 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\LoginTest.php'); //前台登录场景 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\SignOutTest.php'); //前台退出 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\AddressTest.php');//添加地址 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\AddCartTest.php');//加入购物车 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\RemoveCartTest.php');//移除购物车 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\WishlistTest.php');//加入喜欢 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\RemoveWishlistTest.php');//移除喜欢 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\EditUserInfo.php');//修改个人信息 +//后台 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\admin\AdminLoginTest.php'); //后台登录 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\admin\AdminSignOutTest.php'); //后台退出 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\admin\GoCatalogTest.php'); //跳转前台 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\admin\AddGoodsTest.php'); //添加商品 + +//前后台联测 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\OrderTest.php');//商品页下单 + $suite->addTestFile('E:\phpstudy_pro\WWW\autotest.test\beikeshop\tests\Browser\dusktest\page\front\OrderTest.php');//购物车下单 // 运行测试套件 $result = $suite->run(); // 输出测试结果 diff --git a/tests/Browser/dusktest/data/admin/admin_page.php b/tests/Browser/dusktest/data/admin/admin_page.php new file mode 100644 index 00000000..d8465d78 --- /dev/null +++ b/tests/Browser/dusktest/data/admin/admin_page.php @@ -0,0 +1,11 @@ +"/admin", + "root"=> "root", + 'go_catalog'=>'访问前台', + "sign_out"=> " 退出登录", + "mg_product"=>"商品管理", + "VIP"=>"VIP", + "vip_assert"=>"登录购买VIP服务", +]; + diff --git a/tests/Browser/dusktest/data/admin/cre_product.php b/tests/Browser/dusktest/data/admin/cre_product.php new file mode 100644 index 00000000..1b5edd3c --- /dev/null +++ b/tests/Browser/dusktest/data/admin/cre_product.php @@ -0,0 +1,11 @@ +"test",//中文名称 + "en_name"=>"test",//英文名称 + "sku"=>"123",//sku + "price"=>"500",//价格 + "origin_price"=>"50",//原价 + "cost_price"=>"5",//成本价 + "quantity"=>"3",//数量 +]; + diff --git a/tests/Browser/dusktest/data/admin/cre_product_page.php b/tests/Browser/dusktest/data/admin/cre_product_page.php new file mode 100644 index 00000000..450d4035 --- /dev/null +++ b/tests/Browser/dusktest/data/admin/cre_product_page.php @@ -0,0 +1,14 @@ +"/admin/products/create",// + "ch_name"=>"descriptions[zh_cn][name]",//中文名称 + "en_name"=>"descriptions[en][name]",//英文名称 + "sku"=>"skus[0][sku]",//sku + "price"=>"skus[0][price]",//价格 + "origin_price"=>"skus[0][origin_price]",//原价 + "cost_price"=>"skus[0][cost_price]",//成本价 + "quantity"=>"skus[0][quantity]",//数量 + "save_btn"=>"#content > div.page-title-box.py-1.d-flex.align-items-center.justify-content-between > div > button",//保存 + "assert"=>"创建成功!", +]; + diff --git a/tests/Browser/dusktest/data/admin/login.php b/tests/Browser/dusktest/data/admin/login.php new file mode 100644 index 00000000..4195b731 --- /dev/null +++ b/tests/Browser/dusktest/data/admin/login.php @@ -0,0 +1,19 @@ + 'root@guangda.work', + 'password' => '123456', + 'assert' => '后台管理', + +]; +const admin_false_login = [ + 'false_email' => 'test1@163.com', + 'illegal_email' => 'test', + 'false_password' => '1234567', + 'false_assert' => '账号密码不匹配', + 'illegal_assert' => 'email 必须是一个有效的电子邮件地址。', + 'no_email'=>'email 字段是必须的。', + 'no_pwd'=>'password 字段是必须的。', +]; + diff --git a/tests/Browser/dusktest/data/admin/login_page.php b/tests/Browser/dusktest/data/admin/login_page.php new file mode 100644 index 00000000..9cbef76b --- /dev/null +++ b/tests/Browser/dusktest/data/admin/login_page.php @@ -0,0 +1,9 @@ +"/admin/login", + 'tltle'=>'登录到 BeikeShop 后台', + "login_email"=> "#email-input", + "login_pwd"=> "#password-input", + "login_btn"=> "登录", +]; + diff --git a/tests/Browser/dusktest/data/admin/product_page.php b/tests/Browser/dusktest/data/admin/product_page.php new file mode 100644 index 00000000..76c281df --- /dev/null +++ b/tests/Browser/dusktest/data/admin/product_page.php @@ -0,0 +1,6 @@ +"/admin/products", + "create_product"=>"#product-app > div > div > div.d-flex.justify-content-between.my-4 > a > button", +]; + diff --git a/tests/Browser/dusktest/data/account.php b/tests/Browser/dusktest/data/catalog/account.php similarity index 100% rename from tests/Browser/dusktest/data/account.php rename to tests/Browser/dusktest/data/catalog/account.php diff --git a/tests/Browser/dusktest/data/account_page.php b/tests/Browser/dusktest/data/catalog/account_page.php similarity index 100% rename from tests/Browser/dusktest/data/account_page.php rename to tests/Browser/dusktest/data/catalog/account_page.php diff --git a/tests/Browser/dusktest/data/checkout_page.php b/tests/Browser/dusktest/data/catalog/checkout_page.php similarity index 100% rename from tests/Browser/dusktest/data/checkout_page.php rename to tests/Browser/dusktest/data/catalog/checkout_page.php diff --git a/tests/Browser/dusktest/data/index_page.php b/tests/Browser/dusktest/data/catalog/index_page.php similarity index 98% rename from tests/Browser/dusktest/data/index_page.php rename to tests/Browser/dusktest/data/catalog/index_page.php index c2c7c772..48919054 100644 --- a/tests/Browser/dusktest/data/index_page.php +++ b/tests/Browser/dusktest/data/catalog/index_page.php @@ -8,7 +8,7 @@ const index = [ ]; const index_top = [ "wishlist_btn" => "",//购买商品图标 - // + "top_Sports"=>"Sports", "buy_btn" => "#product-top > div:nth-child(2) > div > div.quantity-btns > button.btn.btn-dark.ms-3.fw-bold",//购买按钮 "address_btn" => "#checkout-address-app > div.checkout-black > div.addresses-wrap > div > div > div > button", //添加地址 "login_text" => "Home", diff --git a/tests/Browser/dusktest/data/login.php b/tests/Browser/dusktest/data/catalog/login.php similarity index 100% rename from tests/Browser/dusktest/data/login.php rename to tests/Browser/dusktest/data/catalog/login.php diff --git a/tests/Browser/dusktest/data/login_page.php b/tests/Browser/dusktest/data/catalog/login_page.php similarity index 100% rename from tests/Browser/dusktest/data/login_page.php rename to tests/Browser/dusktest/data/catalog/login_page.php diff --git a/tests/Browser/dusktest/data/order_page.php b/tests/Browser/dusktest/data/catalog/order_page.php similarity index 100% rename from tests/Browser/dusktest/data/order_page.php rename to tests/Browser/dusktest/data/catalog/order_page.php diff --git a/tests/Browser/dusktest/data/product_1.php b/tests/Browser/dusktest/data/catalog/product_1.php similarity index 100% rename from tests/Browser/dusktest/data/product_1.php rename to tests/Browser/dusktest/data/catalog/product_1.php diff --git a/tests/Browser/dusktest/data/register.php b/tests/Browser/dusktest/data/catalog/register.php similarity index 100% rename from tests/Browser/dusktest/data/register.php rename to tests/Browser/dusktest/data/catalog/register.php diff --git a/tests/Browser/dusktest/page/admin/AddGoodsTest.php b/tests/Browser/dusktest/page/admin/AddGoodsTest.php new file mode 100644 index 00000000..6fb48cfc --- /dev/null +++ b/tests/Browser/dusktest/page/admin/AddGoodsTest.php @@ -0,0 +1,55 @@ +browse(function (Browser $browser) + { + $browser->visit(admin_login['login_url']) + //1.登录 + ->type(admin_login['login_email'], admin_true_login['email']) + ->type(admin_login['login_pwd'], admin_true_login['password']) + ->press(admin_login['login_btn']) + ->pause(2000) + //2.点击商品管理 + ->clickLink(admin_top['mg_product']) + //3.点击添加商品 + ->press(products_top['create_product']) + //4.填写商品信息 + ->type(product_top['ch_name'], product_info['ch_name']) + ->type(product_top['en_name'], product_info['en_name']) + ->type(product_top['sku'], product_info['sku']) + ->type(product_top['price'], product_info['price']) + ->type(product_top['origin_price'], product_info['origin_price']) + ->type(product_top['cost_price'], product_info['cost_price']) + ->type(product_top['quantity'], product_info['quantity']) + //5.点击保存 + ->press(product_top['save_btn']) + ->assertSee(product_top['assert']) + + ; + }); + } +} diff --git a/tests/Browser/dusktest/page/admin/AdminLoginTest.php b/tests/Browser/dusktest/page/admin/AdminLoginTest.php new file mode 100644 index 00000000..ee54ef70 --- /dev/null +++ b/tests/Browser/dusktest/page/admin/AdminLoginTest.php @@ -0,0 +1,93 @@ +browse(function (Browser $browser) + { + $browser->visit(admin_login['login_url']) + ->type(admin_login['login_email'], admin_false_login['illegal_email']) + ->type(admin_login['login_pwd'], admin_true_login['password']) + ->press(admin_login['login_btn']) + ->assertSee(admin_false_login['illegal_assert']); + }); + } + //场景2 email不存在 + public function testEmailFalse() + { + $this->browse(function (Browser $browser) + { + $browser->visit(admin_login['login_url']) + ->type(admin_login['login_email'], admin_false_login['false_email']) + ->type(admin_login['login_pwd'], admin_true_login['password']) + ->press(admin_login['login_btn']) + ->assertSee(admin_false_login['false_assert']); + }); + } +//场景3 密码错误 + public function testPwdFalse() + { + $this->browse(function (Browser $browser) + { + $browser->visit(admin_login['login_url']) + ->type(admin_login['login_email'], admin_true_login['email']) + ->type(admin_login['login_pwd'], admin_false_login['false_password']) + ->press(admin_login['login_btn']) + ->assertSee(admin_false_login['false_assert']); + }); + } + //场景4 只输入email + public function testOnlyEmail() + { + $this->browse(function (Browser $browser) + { + $browser->visit(admin_login['login_url']) + ->type(admin_login['login_email'], admin_true_login['email']) + ->press(admin_login['login_btn']) + ->assertSee(admin_false_login['no_pwd']); + }); + } + //场景5 只输入密码 + public function testOnlyPwd() + { + $this->browse(function (Browser $browser) + { + $browser->visit(admin_login['login_url']) + ->type(admin_login['login_pwd'], admin_true_login['email']) + ->press(admin_login['login_btn']) + ->assertSee(admin_false_login['no_email']); + }); + } + //场景6 成功登录 + public function testLoginFul() + + { + $this->browse(function (Browser $browser) + { + $browser->visit(admin_login['login_url']) + ->type(admin_login['login_email'], admin_true_login['email']) + ->type(admin_login['login_pwd'], admin_true_login['password']) + ->press(admin_login['login_btn']) + ->pause(2000) + ->assertSee(admin_true_login['assert']); + }); + } +} diff --git a/tests/Browser/dusktest/page/admin/AdminSignOutTest.php b/tests/Browser/dusktest/page/admin/AdminSignOutTest.php new file mode 100644 index 00000000..221796cb --- /dev/null +++ b/tests/Browser/dusktest/page/admin/AdminSignOutTest.php @@ -0,0 +1,42 @@ +browse(function (Browser $browser) + { + $browser->visit(admin_login['login_url']) + //1.登录 + ->type(admin_login['login_email'], admin_true_login['email']) + ->type(admin_login['login_pwd'], admin_true_login['password']) + ->press(admin_login['login_btn']) + ->pause(2000) + //2.退出 + ->clickLink(admin_top['root']) + ->pause(2000) + ->clickLink(admin_top['sign_out']) + ->pause(3000) + ->assertSee(admin_login['tltle']); +// ->assertSee(true_login['assert']); + }); + } +} diff --git a/tests/Browser/dusktest/page/admin/GoCatalogTest.php b/tests/Browser/dusktest/page/admin/GoCatalogTest.php new file mode 100644 index 00000000..571bf74c --- /dev/null +++ b/tests/Browser/dusktest/page/admin/GoCatalogTest.php @@ -0,0 +1,44 @@ +browse(function (Browser $browser) + { + $browser->visit(admin_login['login_url']) + //1.登录 + ->type(admin_login['login_email'], admin_true_login['email']) + ->type(admin_login['login_pwd'], admin_true_login['password']) + ->press(admin_login['login_btn']) + ->pause(2000) + //2.去往前台 + ->clickLink(admin_top['root']) + ->pause(2000) + ->clickLink(admin_top['go_catalog']) + ->pause(2000) + //3.切换到第二个窗口并断言 + ->driver->switchTo()->window($browser->driver->getWindowHandles()[1]); + $browser->assertPathIs(index['login_url']) + ; + }); + } +} diff --git a/tests/Browser/dusktest/page/admin/GoVipTest.php b/tests/Browser/dusktest/page/admin/GoVipTest.php new file mode 100644 index 00000000..383737a6 --- /dev/null +++ b/tests/Browser/dusktest/page/admin/GoVipTest.php @@ -0,0 +1,38 @@ +browse(function (Browser $browser) + { + $browser->visit(admin_login['login_url']) + //1.登录 + ->type(admin_login['login_email'], admin_true_login['email']) + ->type(admin_login['login_pwd'], admin_true_login['password']) + ->press(admin_login['login_btn']) + ->pause(2000) + //2.点击vip图标 + ->clickLink(admin_top['VIP']) + //3.切换到第二个窗口并获取断言 + ->driver->switchTo()->window($browser->driver->getWindowHandles()[1]); + $browser->assertSee(admin_top['vip_assert']) + ->pause(9000); + ; + }); + } +} diff --git a/tests/Browser/dusktest/page/admin/GopLuginsTest.php b/tests/Browser/dusktest/page/admin/GopLuginsTest.php new file mode 100644 index 00000000..5f1a9b2f --- /dev/null +++ b/tests/Browser/dusktest/page/admin/GopLuginsTest.php @@ -0,0 +1,38 @@ +browse(function (Browser $browser) + { + $browser->visit(admin_login['login_url']) + //1.登录 + ->type(admin_login['login_email'], admin_true_login['email']) + ->type(admin_login['login_pwd'], admin_true_login['password']) + ->press(admin_login['login_btn']) + ->pause(2000) + //2.插件市场 + ->clickLink(admin_top['VIP']) + //3.切换到第二个窗口并获取断言 + ->driver->switchTo()->window($browser->driver->getWindowHandles()[1]); + $browser->assertSee(admin_top['vip_assert']) + ->pause(9000); + ; + }); + } +} diff --git a/tests/Browser/dusktest/page/front/AddCartTest.php b/tests/Browser/dusktest/page/front/AddCartTest.php index a437803b..37307f10 100644 --- a/tests/Browser/dusktest/page/front/AddCartTest.php +++ b/tests/Browser/dusktest/page/front/AddCartTest.php @@ -7,12 +7,12 @@ use Laravel\Dusk\Browser; use Tests\DuskTestCase; use App\Http\Controllers\By; -require_once(dirname(__FILE__) . '/../../data/login.php'); -require_once(dirname(__FILE__) . '/../../data/login_page.php'); -require_once(dirname(__FILE__) . '/../../data/account_page.php'); -require_once(dirname(__FILE__) . '/../../data/product_1.php'); -require_once(dirname(__FILE__) . '/../../data/index_page.php'); -require_once(dirname(__FILE__) . '/../../data/checkout_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/account_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/product_1.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/index_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/checkout_page.php'); //已注册客户且有地址，直接购买商品 class AddCartTest extends DuskTestCase diff --git a/tests/Browser/dusktest/page/front/AddressTest.php b/tests/Browser/dusktest/page/front/AddressTest.php index 6b81e37f..1caf202a 100644 --- a/tests/Browser/dusktest/page/front/AddressTest.php +++ b/tests/Browser/dusktest/page/front/AddressTest.php @@ -9,10 +9,10 @@ use Laravel\Dusk\Browser; use Tests\DuskTestCase; use App\Http\Controllers\By; -require_once(dirname(__FILE__) . '/../../data/login.php'); -require_once(dirname(__FILE__) . '/../../data/login_page.php'); -require_once(dirname(__FILE__) . '/../../data/account_page.php'); -require_once(dirname(__FILE__) . '/../../data/account.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/account_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/account.php'); diff --git a/tests/Browser/dusktest/page/front/CartCheckoutTest.php b/tests/Browser/dusktest/page/front/CartCheckoutTest.php index 298218bc..e33885be 100644 --- a/tests/Browser/dusktest/page/front/CartCheckoutTest.php +++ b/tests/Browser/dusktest/page/front/CartCheckoutTest.php @@ -7,12 +7,12 @@ use Laravel\Dusk\Browser; use Tests\DuskTestCase; use App\Http\Controllers\By; -require_once(dirname(__FILE__) . '/../../data/login.php'); -require_once(dirname(__FILE__) . '/../../data/login_page.php'); -require_once(dirname(__FILE__) . '/../../data/account_page.php'); -require_once(dirname(__FILE__) . '/../../data/product_1.php'); -require_once(dirname(__FILE__) . '/../../data/index_page.php'); -require_once(dirname(__FILE__) . '/../../data/checkout_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/account_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/product_1.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/index_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/checkout_page.php'); //已注册客户且有地址，直接购买商品 class CartCheckoutTest extends DuskTestCase diff --git a/tests/Browser/dusktest/page/front/EditUserInfo.php b/tests/Browser/dusktest/page/front/EditUserInfo.php index 91484fbd..ba7e43b0 100644 --- a/tests/Browser/dusktest/page/front/EditUserInfo.php +++ b/tests/Browser/dusktest/page/front/EditUserInfo.php @@ -9,10 +9,10 @@ use Laravel\Dusk\Browser; use Tests\DuskTestCase; use App\Http\Controllers\By; -require_once(dirname(__FILE__) . '/../../data/login.php'); -require_once(dirname(__FILE__) . '/../../data/login_page.php'); -require_once(dirname(__FILE__) . '/../../data/account_page.php'); -require_once(dirname(__FILE__) . '/../../data/account.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/account_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/account.php'); diff --git a/tests/Browser/dusktest/page/front/LoginTest.php b/tests/Browser/dusktest/page/front/LoginTest.php index a2b5f357..b11ce7cd 100644 --- a/tests/Browser/dusktest/page/front/LoginTest.php +++ b/tests/Browser/dusktest/page/front/LoginTest.php @@ -5,8 +5,8 @@ namespace Tests\Browser; use Laravel\Dusk\Browser; use Tests\DuskTestCase; -require_once(dirname(__FILE__) . '/../../data/login.php'); -require_once(dirname(__FILE__) . '/../../data/login_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login_page.php'); class LoginTest extends DuskTestCase { diff --git a/tests/Browser/dusktest/page/front/OrderTest.php b/tests/Browser/dusktest/page/front/OrderTest.php index 32aa7566..a7074b09 100644 --- a/tests/Browser/dusktest/page/front/OrderTest.php +++ b/tests/Browser/dusktest/page/front/OrderTest.php @@ -7,12 +7,12 @@ use Laravel\Dusk\Browser; use Tests\DuskTestCase; use App\Http\Controllers\By; -require_once(dirname(__FILE__) . '/../../data/login.php'); -require_once(dirname(__FILE__) . '/../../data/login_page.php'); -require_once(dirname(__FILE__) . '/../../data/account_page.php'); -require_once(dirname(__FILE__) . '/../../data/product_1.php'); -require_once(dirname(__FILE__) . '/../../data/index_page.php'); -require_once(dirname(__FILE__) . '/../../data/checkout_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/account_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/product_1.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/index_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/checkout_page.php'); //已注册客户且有地址，直接购买商品 class OrderTest extends DuskTestCase diff --git a/tests/Browser/dusktest/page/front/RegisterFirst.php b/tests/Browser/dusktest/page/front/RegisterFirst.php index 5c51003e..9b70d33d 100644 --- a/tests/Browser/dusktest/page/front/RegisterFirst.php +++ b/tests/Browser/dusktest/page/front/RegisterFirst.php @@ -10,8 +10,8 @@ use Laravel\Dusk\Browser; use Tests\DuskTestCase; use App\Http\Controllers\By; -require_once(dirname(__FILE__) . '/../../data/login.php'); -require_once(dirname(__FILE__) . '/../../data/login_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login_page.php'); class RegisterFirst extends DuskTestCase { diff --git a/tests/Browser/dusktest/page/front/RegisterTest.php b/tests/Browser/dusktest/page/front/RegisterTest.php index d98534ea..a858eb05 100644 --- a/tests/Browser/dusktest/page/front/RegisterTest.php +++ b/tests/Browser/dusktest/page/front/RegisterTest.php @@ -8,8 +8,8 @@ namespace App\Http\Controllers; use Laravel\Dusk\Browser; use Tests\DuskTestCase; -require_once(dirname(__FILE__) . '/../../data/register.php'); -require_once(dirname(__FILE__) . '/../../data/login_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/register.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/ogin_page.php'); class RegisterTest extends DuskTestCase { diff --git a/tests/Browser/dusktest/page/front/RemoveCartTest.php b/tests/Browser/dusktest/page/front/RemoveCartTest.php index b876472b..b86c8441 100644 --- a/tests/Browser/dusktest/page/front/RemoveCartTest.php +++ b/tests/Browser/dusktest/page/front/RemoveCartTest.php @@ -7,12 +7,12 @@ use Laravel\Dusk\Browser; use Tests\DuskTestCase; use App\Http\Controllers\By; -require_once(dirname(__FILE__) . '/../../data/login.php'); -require_once(dirname(__FILE__) . '/../../data/login_page.php'); -require_once(dirname(__FILE__) . '/../../data/account_page.php'); -require_once(dirname(__FILE__) . '/../../data/product_1.php'); -require_once(dirname(__FILE__) . '/../../data/index_page.php'); -require_once(dirname(__FILE__) . '/../../data/checkout_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/account_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/product_1.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/index_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/checkout_page.php'); //已注册客户且有地址，直接购买商品 class RemoveCartTest extends DuskTestCase diff --git a/tests/Browser/dusktest/page/front/RemoveWishlistTest.php b/tests/Browser/dusktest/page/front/RemoveWishlistTest.php index 58d741f8..70d76a0d 100644 --- a/tests/Browser/dusktest/page/front/RemoveWishlistTest.php +++ b/tests/Browser/dusktest/page/front/RemoveWishlistTest.php @@ -7,12 +7,12 @@ use Laravel\Dusk\Browser; use Tests\DuskTestCase; use App\Http\Controllers\By; -require_once(dirname(__FILE__) . '/../../data/login.php'); -require_once(dirname(__FILE__) . '/../../data/login_page.php'); -require_once(dirname(__FILE__) . '/../../data/account_page.php'); -require_once(dirname(__FILE__) . '/../../data/product_1.php'); -require_once(dirname(__FILE__) . '/../../data/index_page.php'); -require_once(dirname(__FILE__) . '/../../data/checkout_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/account_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/product_1.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/index_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/checkout_page.php'); //已注册客户且有地址，直接购买商品 class RemoveWishlistTest extends DuskTestCase diff --git a/tests/Browser/dusktest/page/front/SignOutTest.php b/tests/Browser/dusktest/page/front/SignOutTest.php index 0476afda..3fd52012 100644 --- a/tests/Browser/dusktest/page/front/SignOutTest.php +++ b/tests/Browser/dusktest/page/front/SignOutTest.php @@ -5,9 +5,9 @@ namespace Tests\Browser; use Laravel\Dusk\Browser; use Tests\DuskTestCase; -require_once(dirname(__FILE__) . '/../../data/login.php'); -require_once(dirname(__FILE__) . '/../../data/login_page.php'); -require_once(dirname(__FILE__) . '/../../data/account_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/account_page.php'); class SignOutTest extends DuskTestCase { diff --git a/tests/Browser/dusktest/page/front/WishlistTest.php b/tests/Browser/dusktest/page/front/WishlistTest.php index 38406c61..d0dcb5c9 100644 --- a/tests/Browser/dusktest/page/front/WishlistTest.php +++ b/tests/Browser/dusktest/page/front/WishlistTest.php @@ -7,12 +7,12 @@ use Laravel\Dusk\Browser; use Tests\DuskTestCase; use App\Http\Controllers\By; -require_once(dirname(__FILE__) . '/../../data/login.php'); -require_once(dirname(__FILE__) . '/../../data/login_page.php'); -require_once(dirname(__FILE__) . '/../../data/account_page.php'); -require_once(dirname(__FILE__) . '/../../data/product_1.php'); -require_once(dirname(__FILE__) . '/../../data/index_page.php'); -require_once(dirname(__FILE__) . '/../../data/checkout_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/login_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/account_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/product_1.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/index_page.php'); +require_once(dirname(__FILE__) . '/../../data/catalog/checkout_page.php'); //已注册客户且有地址，直接购买商品 class WishlistTest extends DuskTestCase @@ -27,6 +27,7 @@ class WishlistTest extends DuskTestCase ->type(login['login_pwd'], true_login['password']) ->press(login['login_btn']) ->pause(2000) + //2.点击home跳转到首页 ->clickLink(account['go_index']) //3.向下滑动页面直到找到元素