Merge pull request #821 from prashant-webkul/development

Development
This commit is contained in:
Jitendra Singh 2019-04-15 15:02:09 +05:30 committed by GitHub
commit 810e57f092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 166 additions and 17 deletions

View File

@ -36,6 +36,7 @@
"barryvdh/laravel-debugbar": "^3.1",
"filp/whoops": "^2.0",
"fzaninotto/faker": "^1.4",
"laravel/dusk": "^4.0",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0",
"phpunit/phpunit": "^7.0"

View File

@ -302,7 +302,7 @@
</table>
</div>
<button type="button" class="btn btn-lg btn-primary" id="add-option-btn" style="margin-top: 20px" @click="addOptionRow()">
<button type="button" class="btn btn-lg btn-primary mt-20" id="add-option-btn" @click="addOptionRow()">
{{ __('admin::app.catalog.attributes.add-option-btn-title') }}
</button>
</div>

View File

@ -421,7 +421,7 @@ input {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(235px, 1fr));
grid-auto-rows: auto;
grid-column-gap: 48px;
grid-column-gap: 30px;
grid-row-gap: 15px;
justify-items: end;
}
@ -827,7 +827,6 @@ section.slider-block {
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
padding-left: 12px;
font-family: "Montserrat", sans-serif;
font-size: 14px;
}
@ -854,9 +853,8 @@ section.slider-block {
> li {
display: inline-block;
border-right: 2px solid $border-color;
cursor: pointer;
padding: 0 15px;
min-height: 26px;
min-height: 15px;
padding-top: 3px;
&:first-child {
@ -1362,14 +1360,6 @@ section.slider-block {
.control-group {
.subscribe-field {
width: 100%;
&::-webkit-input-placeholder {
font-family: "montserrat", sans-serif;
}
&::-moz-placeholder {
font-family: "montserrat", sans-serif;
}
}
.btn-primary {
@ -2483,8 +2473,11 @@ section.cart {
padding-top: 20px;
.form-header {
display: inline-flex;
align-items: center;
justify-content: space-between;
width: 100%;
display: inline-block;
height: 30px;
.checkout-step-heading {
font-size: 24px;

View File

@ -97,11 +97,11 @@
</div>
<div style="margin-top: 15px;">
<a class="btn btn-primary btn-sm" href="{{ route('customer.session.index') }}" style="color: #ffffff">
<a class="btn btn-primary btn-md" href="{{ route('customer.session.index') }}" style="color: #ffffff">
{{ __('shop::app.header.sign-in') }}
</a>
<a class="btn btn-primary btn-sm" href="{{ route('customer.register.index') }}" style="float: right; color: #ffffff">
<a class="btn btn-primary btn-md" href="{{ route('customer.register.index') }}" style="float: right; color: #ffffff">
{{ __('shop::app.header.sign-up') }}
</a>
</div>

View File

@ -16,7 +16,7 @@
"extra": {
"laravel": {
"providers": [
"Webkul\\Ui\\UiServiceProvider"
"Webkul\\Ui\\Providers\\UiServiceProvider"
],
"aliases": {}
}

View File

@ -19,6 +19,7 @@
"flatpickr": "^4.4.6"
},
"dependencies": {
"tooltip.js": "^1.3.1",
"vue-swatches": "^1.0.3"
}
}

View File

@ -1,5 +1,6 @@
$font-color: #3a3a3a;
$brand-color: #0041FF;
$selection-color: rgba(0, 64, 255, 0.6);
$info-color: #204d74;
$danger-color: #FC6868;
$success-color: #4CAF50;

View File

@ -15,6 +15,11 @@
outline: none;
}
body {
letter-spacing: -0.26px;
line-height: 19px;
}
a:link,
a:hover,
a:visited,
@ -24,6 +29,11 @@ a:active {
color: $brand-color;
}
::selection {
background-color: $selection-color;
color: $color-white;
}
textarea {
resize: none;
}
@ -145,6 +155,10 @@ h5 {
}
}
.dropdown-toggle {
cursor: pointer;
}
.dropdown-open {
position: relative;
}

View File

@ -0,0 +1,26 @@
<?php
namespace Tests\Browser;
use Tests\DuskTestCase;
use Laravel\Dusk\Browser;
use Illuminate\Foundation\Testing\DatabaseMigrations;
class ExampleTest extends DuskTestCase
{
/**
* A basic browser test example.
*
* @return void
*/
public function testBasicExample()
{
$this->browse(function (Browser $browser) {
$browser->visit('/customer/login')
->type('email', 'prashant@webkul.com')
->type('password', '12345678')
->click('input[type="submit"]')
->screenshot('error');
});
}
}

View File

@ -0,0 +1,41 @@
<?php
namespace Tests\Browser\Pages;
use Laravel\Dusk\Browser;
class HomePage extends Page
{
/**
* Get the URL for the page.
*
* @return string
*/
public function url()
{
return '/';
}
/**
* Assert that the browser is on the page.
*
* @param Browser $browser
* @return void
*/
public function assert(Browser $browser)
{
//
}
/**
* Get the element shortcuts for the page.
*
* @return array
*/
public function elements()
{
return [
'@element' => '#selector',
];
}
}

View File

@ -0,0 +1,20 @@
<?php
namespace Tests\Browser\Pages;
use Laravel\Dusk\Page as BasePage;
abstract class Page extends BasePage
{
/**
* Get the global element shortcuts for the site.
*
* @return array
*/
public static function siteElements()
{
return [
'@element' => '#selector',
];
}
}

2
tests/Browser/console/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*
!.gitignore

2
tests/Browser/screenshots/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*
!.gitignore

48
tests/DuskTestCase.php Normal file
View File

@ -0,0 +1,48 @@
<?php
namespace Tests;
use Laravel\Dusk\TestCase as BaseTestCase;
use Facebook\WebDriver\Chrome\ChromeOptions;
use Facebook\WebDriver\Remote\RemoteWebDriver;
use Facebook\WebDriver\Remote\DesiredCapabilities;
abstract class DuskTestCase extends BaseTestCase
{
use CreatesApplication;
/**
* Prepare for Dusk test execution.
*
* @beforeClass
* @return void
*/
public static function prepare()
{
static::startChromeDriver();
}
/**
* Create the RemoteWebDriver instance.
*
* @return \Facebook\WebDriver\Remote\RemoteWebDriver
*/
protected function driver()
{
$options = (new ChromeOptions)->addArguments([
'--disable-gpu',
'--headless',
'--no-sandbox'
]);
return RemoteWebDriver::create(
'http://localhost:9515/', DesiredCapabilities::chrome()
);
// return RemoteWebDriver::create(
// 'http://localhost:9515', DesiredCapabilities::chrome()->setCapability(
// ChromeOptions::CAPABILITY, $options
// )
// );
}
}