Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/tests/AdminTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public function setUp()
// Load the service config file, which is in YAML format
$loader->load('../services.yml');
// Get objects from container
$this->container->setParameter('config.configfile', __DIR__ . '/../../config.ini.dist');
$this->config = $this->container->get('Config');

$this->admin = $this->container->get('Admin');
Expand Down
2 changes: 1 addition & 1 deletion core/tests/ListManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function setUp()
// Load the service config file, which is in YAML format
$loader->load('../services.yml');
// Set necessary config class parameter
$this->container->setParameter('config.configfile', '/var/www/pl4/config.ini');
$this->container->setParameter('config.configfile', __DIR__ . '/../../config.ini.dist');
// Get objects from container
$this->scrEntity = $this->container->get('SubscriberEntity');
$this->listManager = $this->container->get('ListManager');
Expand Down
2 changes: 1 addition & 1 deletion core/tests/ListModelTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function setUp()
// Load the service config file, which is in YAML format
$loader->load('../services.yml');
// Set necessary config class parameter
$this->container->setParameter('config.configfile', '/var/www/pl4/config.ini');
$this->container->setParameter('config.configfile', __DIR__ . '/../../config.ini.dist');
// Get objects from container
$this->listModel = $this->container->get('ListModel');
}
Expand Down
1 change: 1 addition & 0 deletions core/tests/PassTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public function setUp()
$loader = new YamlFileLoader($this->container, new FileLocator(__DIR__));
// Load the service config file, which is in YAML format
$loader->load('../services.yml');
$this->container->setParameter('config.configfile', __DIR__ . '/../../config.ini.dist');
// Get objects from container
$this->pass = $this->container->get('Pass');
// Set default pwd for testing
Expand Down
7 changes: 1 addition & 6 deletions core/tests/ServicesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,15 @@ public function setUp()
$loader = new YamlFileLoader($this->container, new FileLocator(__DIR__));
// Load the service config file, which is in YAML format
$loader->load('../services.yml');
$this->container->setParameter('config.configfile', __DIR__ . '/../../config.ini.dist');
}

public function testConfigService()
{
// Set service parameters
$this->container->setParameter('config.configfile', '/var/www/pl4/config.ini');

$config = $this->container->get('Config');
}
public function testPhplistService()
{
// Set service parameters
$this->container->setParameter('config.configfile', '/var/www/pl4/config.ini');

$config = $this->container->get('phpList');
}
}
1 change: 1 addition & 0 deletions core/tests/SubscriberManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public function setUp()
$loader = new YamlFileLoader($this->container, new FileLocator(__DIR__));
// Load the service config file, which is in YAML format
$loader->load('../services.yml');
$this->container->setParameter('config.configfile', __DIR__ . '/../../config.ini.dist');
$this->subscriberManager = $this->container->get('SubscriberManager');
}

Expand Down
2 changes: 1 addition & 1 deletion core/tests/SubscriberModelTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function setUp()
$this->plainPass = 'easypassword';

// Instantiate config object
$this->configFile = dirname(__FILE__) . '/../../config.ini';
$this->configFile = __DIR__ . '/../../config.ini.dist';
$this->config = new Config($this->configFile);

// Instantiate remaining classes
Expand Down
2 changes: 1 addition & 1 deletion core/tests/phpunit-bootstrap.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

// Include Symfony autoloader
// Include Composer autoloader
require_once('../vendor/autoload.php');

// Set timezone to avoid warnings
Expand Down