Permalink
Browse files

Accomodate variable site_root_path in tests

  • Loading branch information...
1 parent 0dd8982 commit 9e59f8750bb76f94c193f0bc5b67361be63067b3 @ginatrapani ginatrapani committed Feb 27, 2014
@@ -387,7 +387,7 @@ public function testMandrillHTML() {
foreach ($decoded->global_merge_vars as $mv) {
$merge_vars[$mv->name] = $mv->content;
}
- $this->assertPattern('/http:\/\/downtonabb.ey\/\?u=/', $merge_vars['insights'], 'Insights URL contains host');
+ $this->assertPattern('/http:\/\/downtonabb.ey\/.*\?u=/', $merge_vars['insights'], 'Insights URL contains host');
$this->assertPattern('/1234 new lists/', $merge_vars['insights']);
$this->assertEqual($config->getValue('app_title_prefix').'ThinkUp', $merge_vars['app_title']);
unlink(FileDataManager::getDataPath(Mailer::EMAIL));
@@ -48,9 +48,8 @@ public function tearDown() {
public function testLoginRequired () {
$controller = $this->getController(false);
- $controller->go();
- $v_mgr = $controller->getViewManager();
- $this->assertPattern('/You must.*log in/', $v_mgr->getTemplateDataItem('error_msg'));
+ $results = $controller->go();
+ $this->assertPattern('/You must.*log in/', $results);
$controller = $this->getController(true);
$controller->go();

0 comments on commit 9e59f87

Please sign in to comment.