bugfix

1. fix previous merge mistake
2. a little change of goodinfo page
3. fix auth privilege session putting bug
4. amendment of authtest

app/Http/Controllers/AuthController.php

@@ -74,7 +74,7 @@ class AuthController extends Controller
             $request->session()->put('username', $user->username);
             $request->session()->put('nickname', $user->nickname);
             if ($user->privilege)
-                $request->session()->put('is_admin', $user->priviege);
+                $request->session()->put('is_admin', $user->privilege);
 
             if ($user->registerCompletion() != 0)
                 return Redirect::to('/register/' . $user->registerCompletion());

resources/views/good/goodInfo.blade.php

@@ -46,10 +46,13 @@
                                 </div>
                             </div>
                         </form>
-                        (库存:{{ $good->count }}件)
                     @endif
-
-                    @if($good->user_id == Session::get('user_id'))
+                        (库存:{{ $good->count }}件)
+                </div>
+            </div>
+            <div class="row">
+                <div class="small-5 columns">
+                    @if($good->user_id == Session::get('user_id') || Session::get('is_admin') == 2)
                         <form action="/good/{{ $good->id }}/edit" style="margin:0px;display:inline;">
                             <input type="submit" class="button" value="修改">
                         </form>

tests/AuthTest.php

@@ -6,6 +6,7 @@ use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\BrowserKitTestCase;
 use App\User;
 use App\UserInfo;
+use Illuminate\Support\Facades\Hash;
 
 class AuthTest extends BrowserKitTestCase
 {
@@ -126,7 +127,27 @@ class AuthTest extends BrowserKitTestCase
             ->type('test@example.com', 'username')
             ->type('test@example.com', 'password')
             ->press('登录')
-            ->seePageIs('/');
+            ->seePageIs('/')
+            ->seeInSession('user_id');
+    }
 
+    public function testSuperAdmin()
+    {
+        $user = new User();
+        $user->privilege = 2;
+        $user->password = Hash::make('admin@example.com');
+        $user->email = "admin@example.com";
+        $user->havecheckedemail = 1;
+        $user->save();
+
+        $this->visit('logout')
+            ->seePageIs('/login')
+            ->assertSessionMissing('user_id');
+
+        $this->visit('login')
+            ->type('admin@example.com', 'username')
+            ->type('admin@example.com', 'password')
+            ->press('登录')
+            ->seeInSession('is_admin', 2);
     }
 }