extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 17:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Trying to get tests to pass

Browse Source 
- Better message for not having the preference type
- Fix missed in_array() typo
This commit is contained in:
nathangray 2018-09-05 10:27:19 -06:00
parent cf1f99a828
commit ec9a219186
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/inc/class.admin_cmd_edit_preferences.inc.php
View File

@ -74,7 +74,7 @@ class admin_cmd_edit_preferences extends admin_cmd
if ($check_only) return; if ($check_only) return;
$prefs = new Api\Preferences(in_array($this->pref, 'default', 'forced') ? $this->pref : $this->account); $prefs = new Api\Preferences(in_array($this->pref, array('default', 'forced')) ? $this->pref : $this->account);
$prefs->read_repository(); $prefs->read_repository();
foreach($this->set as $name => $value) foreach($this->set as $name => $value)
{ {

12
admin/tests/PreferencesCommandTest.php
View File

@ -72,7 +72,8 @@ class PreferencesCommandTest extends CommandBase
$this->assertArrayHasKey($this->preference_name, $post[static::APP]); $this->assertArrayHasKey($this->preference_name, $post[static::APP]);
$this->assertEquals($set[$this->preference_name], $post[static::APP][$this->preference_name]); $this->assertEquals($set[$this->preference_name], $post[static::APP][$this->preference_name]);
// At type level // At type level
$this->assertArrayHasKey($this->preference_name, (Array)$post_pref->$type[static::APP]); $this->assertArrayHasKey($this->preference_name, $post_pref->$type[static::APP],
"$type preferences does not have {$this->preference_name}");
$this->assertEquals($set[$this->preference_name], $post_pref->$type[static::APP][$this->preference_name]); $this->assertEquals($set[$this->preference_name], $post_pref->$type[static::APP][$this->preference_name]);
$this->assertGreaterThan($log_count, $this->get_log_count(), "Command ($command) did not log"); $this->assertGreaterThan($log_count, $this->get_log_count(), "Command ($command) did not log");
@ -119,7 +120,8 @@ class PreferencesCommandTest extends CommandBase
$this->assertEquals($set[$this->preference_name], $post[static::APP][$this->preference_name]); $this->assertEquals($set[$this->preference_name], $post[static::APP][$this->preference_name]);
// At type level // At type level
$this->assertArrayHasKey($this->preference_name, (Array)$post_pref->$type[static::APP]); $this->assertArrayHasKey($this->preference_name, $post_pref->$type[static::APP],
"$type preferences does not have {$this->preference_name}");
$this->assertEquals($set[$this->preference_name], $post_pref->$type[static::APP][$this->preference_name]); $this->assertEquals($set[$this->preference_name], $post_pref->$type[static::APP][$this->preference_name]);
$this->assertGreaterThan($log_count, $this->get_log_count(), "Command ($command) did not log"); $this->assertGreaterThan($log_count, $this->get_log_count(), "Command ($command) did not log");
@ -168,7 +170,8 @@ class PreferencesCommandTest extends CommandBase
); );
// At type level // At type level
$this->assertArrayHasKey($this->preference_name, (Array)$post_pref->$type[static::APP]); $this->assertArrayHasKey($this->preference_name, $post_pref->$type[static::APP],
"$type preferences does not have {$this->preference_name}");
$this->assertEquals($set[$this->preference_name], $post_pref->$type[static::APP][$this->preference_name]); $this->assertEquals($set[$this->preference_name], $post_pref->$type[static::APP][$this->preference_name]);
$this->assertGreaterThan($log_count, $this->get_log_count(), "Command ($command) did not log"); $this->assertGreaterThan($log_count, $this->get_log_count(), "Command ($command) did not log");
@ -213,7 +216,8 @@ class PreferencesCommandTest extends CommandBase
$post = $post_pref->read_repository(false); $post = $post_pref->read_repository(false);
// At type level - should always be what we set // At type level - should always be what we set
$this->assertArrayHasKey($this->preference_name, (Array)$post_pref->$type[static::APP]); $this->assertArrayHasKey($this->preference_name, $post_pref->$type[static::APP],
"$type preferences does not have {$this->preference_name}");
$this->assertEquals($set[$this->preference_name], $post_pref->$type[static::APP][$this->preference_name]); $this->assertEquals($set[$this->preference_name], $post_pref->$type[static::APP][$this->preference_name]);
// At user level - depends on type priority // At user level - depends on type priority