1 files changed, 37 insertions, 0 deletions
diff --git a/tests/codeigniter/core/Model_test.php b/tests/codeigniter/core/Model_test.php
new file mode 100644
index 000000000..80dc97b3b
--- /dev/null
+++ b/tests/codeigniter/core/Model_test.php
@@ -0,0 +1,37 @@
+<?php
+
+class Model_test extends CI_TestCase {
+
+	private $ci_obj;
+
+	public function set_up()
+	{
+		$loader = $this->ci_core_class('loader');
+		$this->load = new $loader();
+		$this->ci_obj = $this->ci_instance();
+		$this->ci_set_core_class('model', 'CI_Model');
+
+		$model_code =<<<MODEL
+<?php
+class Test_model extends CI_Model {
+
+	public \$property = 'foo';
+
+}
+MODEL;
+
+		$this->ci_vfs_create('Test_model', $model_code, $this->ci_app_root, 'models');
+		$this->load->model('test_model');
+	}
+
+	// --------------------------------------------------------------------
+
+	public function test__get()
+	{
+		$this->assertEquals('foo', $this->ci_obj->test_model->property);
+
+		$this->ci_obj->controller_property = 'bar';
+		$this->assertEquals('bar', $this->ci_obj->test_model->controller_property);
+	}
+
+}
+\ No newline at end of file