From 82b6d2b31bdfa3db51d661f3515e9558853d4fa9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 21 Apr 2020 21:13:00 -0700
Subject: [PATCH] Fixed a few more tests
---
.env.testing-ci | 2 +-
resources/views/layouts/basic.blade.php | 4 ++--
tests/acceptance.suite.yml | 2 +-
tests/acceptance/HomeCept.php | 8 --------
tests/acceptance/LoginCest.php | 18 ++++++++++++++++++
5 files changed, 22 insertions(+), 12 deletions(-)
delete mode 100644 tests/acceptance/HomeCept.php
create mode 100644 tests/acceptance/LoginCest.php
diff --git a/.env.testing-ci b/.env.testing-ci
index 978c1895a..a39cb5976 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 d6f59b920..173a84ac2 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 d77619bc0..8c6d2cd61 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 d34d93049..000000000
--- 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 000000000..32f053e40
--- /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]');
+ }
+}
--
GitLab