From 974ff302efdcbaa54404f94f6e46d9a906268492 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Wed, 25 Jan 2012 08:37:04 -0600
Subject: [PATCH] adding some view tests and fixing a few bugs.

---
 laravel/session.php               | 10 +++---
 laravel/view.php                  | 14 +++++---
 tests/cases/laravel/view.test.php | 53 +++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 10 deletions(-)
 create mode 100644 tests/cases/laravel/view.test.php

diff --git a/laravel/session.php b/laravel/session.php
index d2253834..0c598a7b 100644
--- a/laravel/session.php
+++ b/laravel/session.php
@@ -1,10 +1,5 @@
 <?php namespace Laravel;
 
-if (Config::get('application.key') === '')
-{
-	throw new \Exception("An application key is required to use sessions.");
-}
-
 class Session {
 
 	/**
@@ -29,6 +24,11 @@ class Session {
 	 */
 	public static function start($driver)
 	{
+		if (Config::get('application.key') === '')
+		{
+			throw new \Exception("An application key is required to use sessions.");
+		}
+
 		static::$instance = new Session\Payload(static::factory($driver));
 	}
 
diff --git a/laravel/view.php b/laravel/view.php
index 61b13faa..2e041375 100644
--- a/laravel/view.php
+++ b/laravel/view.php
@@ -21,7 +21,7 @@ class View implements ArrayAccess {
 	 *
 	 * @var string
 	 */
-	protected $path;
+	public $path;
 
 	/**
 	 * All of the shared view data.
@@ -68,12 +68,16 @@ public function __construct($view, $data = array())
 		// This makes error display in the view extremely convenient, since the
 		// developer can always assume they have a message container instance
 		// available to them in the view.
-		if (Config::get('session.driver') !== '' and Session::started() and ! isset($this['errors']))
+		if ( ! isset($this->data['errors']))
 		{
-			$this->data['errors'] = Session::get('errors', function()
+			if (Session::started() and Session::has('errors'))
 			{
-				return new Messages;
-			});
+				$this->data['errors'] = Session::get('errors');
+			}
+			else
+			{
+				$this->data['errors'] = new Messages;
+			}
 		}
 	}
 
diff --git a/tests/cases/laravel/view.test.php b/tests/cases/laravel/view.test.php
new file mode 100644
index 00000000..caf5406b
--- /dev/null
+++ b/tests/cases/laravel/view.test.php
@@ -0,0 +1,53 @@
+<?php
+
+class ViewTest extends PHPUnit_Framework_TestCase {
+
+	/**
+	 * Test the View class constructor.
+	 *
+	 * @group laravel
+	 */
+	public function testViewNameIsSetByConstrutor()
+	{
+		$view = new View('home.index');
+
+		$this->assertEquals('home.index', $view->view);
+	}
+
+	/**
+	 * Test the View class constructor.
+	 *
+	 * @group laravel
+	 */
+	public function testViewIsCreatedWithCorrectPath()
+	{
+		$view = new View('home.index');
+
+		$this->assertEquals(APP_PATH.'views/home/index.php', $view->path);
+	}
+
+	/**
+	 * Test the View class constructor.
+	 *
+	 * @group laravel
+	 */
+	public function testDataIsSetOnViewByConstructor()
+	{
+		$view = new View('home.index', array('name' => 'Taylor'));
+
+		$this->assertEquals('Taylor', $view->data['name']);
+	}
+
+	/**
+	 * Test the View class constructor.
+	 *
+	 * @group laravel
+	 */
+	public function testEmptyMessageContainerSetOnViewWhenNoErrorsInSession()
+	{
+		$view = new View('home.index');
+
+		$this->assertInstanceOf('Laravel\\Messages', $view->data['errors']);
+	}
+
+}
\ No newline at end of file