diff --git a/.env.testing-ci b/.env.testing-ci index 978c1895a3ebe0dd01726af3801468b2a0e62721..a39cb5976c051143d43f0861d2adcae0c8b4de4d 100644 --- a/.env.testing-ci +++ b/.env.testing-ci @@ -2,7 +2,7 @@ # REQUIRED: BASIC APP SETTINGS # -------------------------------------------- APP_ENV=testing-ci -APP_DEBUG=true +APP_DEBUG=false APP_KEY=ChangeMe APP_URL=http://localhost:8000 APP_TIMEZONE='US/Pacific' diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php index d6f59b9206f285951ccdd3e7c0b1be7fc954f18d..173a84ac261623b181aa5758b192bcc04b9a6ff3 100644 --- a/resources/views/layouts/basic.blade.php +++ b/resources/views/layouts/basic.blade.php @@ -10,10 +10,10 @@ <link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ? Storage::disk('public')->url('').e($snipeSettings->favicon) : 'favicon.ico' }} "> {{-- stylesheets --}} - <link rel="stylesheet" href="{{ mix('css/all.css') }}"> + <link rel="stylesheet" href="{{ url('css/all.css') }}"> - <link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}"> + <link rel="stylesheet" href="{{ url('css/dist/all.css') }}"> <link rel="shortcut icon" type="image/ico" href="{{ url(asset('favicon.ico')) }}"> diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml index d77619bc0b3f04fd7602d6ff9db5367bd972e660..8c6d2cd616f9e67277a9c3233ca85ec11bd62049 100644 --- a/tests/acceptance.suite.yml +++ b/tests/acceptance.suite.yml @@ -11,7 +11,7 @@ class_name: AcceptanceTester modules: enabled: - WebDriver: - url: 'https://snipe-it.dev:1337' + url: 'https://snipe-it.local:8890' browser: 'firefox' - \Helper\Acceptance - Laravel5: diff --git a/tests/acceptance/HomeCept.php b/tests/acceptance/HomeCept.php deleted file mode 100644 index d34d93049aa16914740e3e6ff78c866ad6e9a2ea..0000000000000000000000000000000000000000 --- a/tests/acceptance/HomeCept.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -$I = new AcceptanceTester($scenario); - -$I->wantTo('sign in'); -$I->amOnPage('/login'); -$I->see('Please Login'); -$I->seeElement('input[type=text]'); -$I->seeElement('input[type=password]'); diff --git a/tests/acceptance/LoginCest.php b/tests/acceptance/LoginCest.php new file mode 100644 index 0000000000000000000000000000000000000000..32f053e4040f2a720e64fc245b5bc92cc7facb83 --- /dev/null +++ b/tests/acceptance/LoginCest.php @@ -0,0 +1,18 @@ +<?php + +class LoginCest +{ + public function _before(AcceptanceTester $I) + { + } + + // tests + public function tryToTest(AcceptanceTester $I) + { + $I->wantTo('sign in'); + $I->amOnPage('/login'); + $I->see(trans('auth/general.login_prompt')); + $I->seeElement('input[type=text]'); + $I->seeElement('input[type=password]'); + } +}