Merge 5c371af into d4b097e

GrupaZero · May 9, 2017 · d9e32e3 · d9e32e3
2 parents d4b097e + 5c371af
commit d9e32e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/resources/views/account/edit.blade.php b/resources/views/account/edit.blade.php
@@ -15,7 +15,7 @@
         <div class="col-md-5">
             <form id="edit-account-form" action="#" method="POST" role="form">
                 <div class="form-group{{ $errors->first('nick') ? ' has-error' : '' }}">
-                    <label class="control-label" for="firstName">@lang('common.nick')</label>
+                    <label class="control-label" for="nick">@lang('common.nick')</label>
                     <input type="text" id="nick" name="nick" class="form-control"
                            value="{{ $user->nick }}"
                            placeholder="@lang('common.nick')">

diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
@@ -33,7 +33,7 @@
                 <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
 
                 @if ($errors->has('password_confirmation'))
-                    <p class="help-block">{{ $errors->first('password_confirmation') }}/p>
+                    <p class="help-block">{{ $errors->first('password_confirmation') }}</p>
                 @endif
             </div>
             <div class="form-group">

diff --git a/tests/functional/LoginCest.php b/tests/functional/LoginCest.php
@@ -114,6 +114,8 @@ function () use ($mock) {
             }
         );
 
+        $appName = $I->getApplication()->make('config')->get('app.name');
+
         $mock->shouldReceive('send')->once()
             ->with(
                 'emails.auth.welcome',
@@ -125,13 +127,13 @@ function ($data) use ($I) {
                     }
                 ),
                 m::on(
-                    function ($closure) use ($I) {
+                    function ($closure) use ($I, $appName) {
                         $message = m::mock();
                         $message->shouldReceive('to')
                             ->with('example@example.com', 'nick')
                             ->andReturn(m::self());
                         $message->shouldReceive('subject')
-                            ->with('Welcome to GZERO-CMS')
+                            ->with("Welcome to $appName")
                             ->andReturn(m::self());
                         try {
                             $closure($message);