Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'dstockto/test_debadify'

  • Loading branch information...
commit ba380953b572136e4e29b3774abb4c0df1b6a3b3 2 parents d88d3a1 + b53b92a
@lornajane lornajane authored
View
23 src/tests/application/helpers/UserHelperTest.php
@@ -14,13 +14,7 @@ protected function setUp()
$this->ci->load->helper('user_helper');
$this->ci->load->library('session');
}
- protected function tearDown()
- {
-
- }
-
- //--------------------
-
+
/**
* Check to ensure user logged in check works
*/
@@ -58,19 +52,4 @@ public function testCheckUserIsAdmin()
$this->assertTrue(user_is_admin());
}
-
- public function testIsEventAdmin()
- {
- $this->markTestIncomplete('Half-written');
- $this->ci->db->select('*');
- $this->ci->db->from('user_admin');
- $this->ci->db->where(array('rcode !=','pending'));
- $query = $this->ci->db->get();
-
- print_r($query);
-
- //$eventUser = $this->ci->db->get_where('user_admin',array('rcode !=','pending'))->result();
- var_dump($eventUser);
- }
-
}
View
18 src/tests/application/models/EventModelTest.php
@@ -102,23 +102,7 @@ public function testValidEventTalkDataIncludePrivate()
$this->markTestSkipped('Private event not found.');
}
}
-
- /**
- * Ensure that the "hot", "Upcoming" and "past" events are all working
- */
- public function testEventsOfType ()
- {
- $hotEvents = $this->ci->event_model->getEventsOfType('hot');
- $upcomingEvents = $this->ci->event_model->getEventsOfType('upcoming');
- $pastEvents = $this->ci->event_model->getEventsOfType('past');
-
- $this->assertTrue(
- (count($hotEvents)>0 && isset($hotEvents[0]->ID)) &&
- (count($upcomingEvents)>0 && isset($upcomingEvents[0]->ID)) &&
- (count($pastEvents)>0 && isset($pastEvents[0]->ID))
- );
- }
-
+
public function testGetHotEvents()
{
$this->assertEquals(
Please sign in to comment.
Something went wrong with that request. Please try again.