фикс
This commit is contained in:
@@ -7,6 +7,7 @@ use App\Http\Requests\SaveLoginScreenNewsRequest;
|
|||||||
use App\Models\LoginScreenNews;
|
use App\Models\LoginScreenNews;
|
||||||
use App\Services\LoginScreenNewsService;
|
use App\Services\LoginScreenNewsService;
|
||||||
use Illuminate\Http\RedirectResponse;
|
use Illuminate\Http\RedirectResponse;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
use Illuminate\View\View;
|
use Illuminate\View\View;
|
||||||
|
|
||||||
class LoginScreenNewsController extends Controller
|
class LoginScreenNewsController extends Controller
|
||||||
@@ -17,7 +18,7 @@ class LoginScreenNewsController extends Controller
|
|||||||
'newsItems' => $news->listForAdmin(),
|
'newsItems' => $news->listForAdmin(),
|
||||||
'newsStats' => $news->stats(),
|
'newsStats' => $news->stats(),
|
||||||
'feedPreview' => $news->renderFeed(),
|
'feedPreview' => $news->renderFeed(),
|
||||||
'feedUrl' => route('launcher.login-news.show'),
|
'feedUrl' => Str::replaceFirst('https://', 'http://', route('launcher.login-news.show')),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -91,6 +91,20 @@ class LoginScreenNewsFeatureTest extends TestCase
|
|||||||
$response->assertSee(route('launcher.login-news.show'), false);
|
$response->assertSee(route('launcher.login-news.show'), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_admin_page_always_renders_feed_link_with_http_scheme(): void
|
||||||
|
{
|
||||||
|
$response = $this->withServerVariables([
|
||||||
|
'HTTP_X_FORWARDED_PROTO' => 'https',
|
||||||
|
'HTTP_X_FORWARDED_HOST' => 'moon-well.online',
|
||||||
|
'HTTP_X_FORWARDED_PORT' => 443,
|
||||||
|
'HTTP_HOST' => 'moon-well.online',
|
||||||
|
'REMOTE_ADDR' => '127.0.0.1',
|
||||||
|
])->actingAs($this->makeUser(3))->get(route('admin.login-screen-news.index'));
|
||||||
|
|
||||||
|
$response->assertOk();
|
||||||
|
$response->assertSee('http://moon-well.online/launcher/login-news.txt', false);
|
||||||
|
}
|
||||||
|
|
||||||
public function test_admin_can_create_update_and_delete_news_item(): void
|
public function test_admin_can_create_update_and_delete_news_item(): void
|
||||||
{
|
{
|
||||||
$admin = $this->makeUser(3);
|
$admin = $this->makeUser(3);
|
||||||
|
|||||||
Reference in New Issue
Block a user