Skip to content

Commit

Permalink
fix: fix dav url on dav settings page (#2685)
Browse files Browse the repository at this point in the history
  • Loading branch information
asbiin authored May 16, 2019
1 parent 9fe9389 commit 9037113
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 11 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Enhancements:

Fixes:

* Fix dav url on dav settings page
* Fix debt direction on debt edit
* Fix schedule run in case cron can't run on fix hours
* Fix contact create with birthdate age 0
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/SettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ public function api()

public function dav()
{
$davroute = route('settings.dav');
$davroute = route('sabre.dav');
$email = auth()->user()->email;

return view('settings.dav.index')
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/langs/en.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"/js/manifest.js": "/js/manifest.js?id=01c8731923a46c30aaed",
"/js/app.js": "/js/app.js?id=f8389d51dd0f86bf95f0",
"/js/app.js": "/js/app.js?id=e57218ce400a176f0d7c",
"/css/app-ltr.css": "/css/app-ltr.css?id=ed328c169f456c72e814",
"/css/app-rtl.css": "/css/app-rtl.css?id=95afd05762af078bc669",
"/css/stripe.css": "/css/stripe.css?id=d41d8cd98f00b204e980",
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/en/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
'breadcrumb_add_note' => 'Add a note',
'breadcrumb_edit_note' => 'Edit a note',
'breadcrumb_api' => 'API',
'breadcrumb_api' => 'DAV Resources',
'breadcrumb_dav' => 'DAV Resources',
'breadcrumb_edit_introductions' => 'How did you meet',
'breadcrumb_settings_personalization' => 'Personalization',
'breadcrumb_settings_security' => 'Security',
Expand Down
44 changes: 44 additions & 0 deletions tests/Browser/Pages/SettingsDAV.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php

namespace Tests\Browser\Pages;

use Laravel\Dusk\Browser;
use Illuminate\Foundation\Testing\DatabaseTransactions;

class SettingsDAV extends Page
{
use DatabaseTransactions;

/**
* Get the URL for the page.
*
* @return string
*/
public function url()
{
return '/settings/dav';
}

/**
* Assert that the browser is on the page.
*
* @param Browser $browser
* @return void
*/
public function assert(Browser $browser)
{
$browser->assertPathIs($this->url());
}

/**
* Get the element shortcuts for the page.
*
* @return array
*/
public function elements()
{
return [
'dav_url_base' => '#dav_url_base',
];
}
}
28 changes: 28 additions & 0 deletions tests/Browser/Settings/DAVControllerTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

namespace Tests\Browser\Settings;

use Tests\DuskTestCase;
use App\Models\User\User;
use Laravel\Dusk\Browser;
use Tests\Browser\Pages\SettingsDAV;

class DAVControllerTest extends DuskTestCase
{
/**
* Test if the dav url is present.
*/
public function test_it_has_dav_url()
{
$user = factory(User::class)->create();
$user->account->populateDefaultFields();
$user->acceptPolicy();

$this->browse(function (Browser $browser) use ($user) {
$browser->loginAs($user)
->visit(new SettingsDAV)
->assertVisible('dav_url_base')
->assertSourceHas(config('app.url').'/dav');
});
}
}

0 comments on commit 9037113

Please sign in to comment.