diff options
| author | Justin Witz <jwitz@twilio.com> | 2016-01-19 10:39:35 -0800 |
|---|---|---|
| committer | Justin Witz <jwitz@twilio.com> | 2016-01-19 10:39:35 -0800 |
| commit | daea77c1f476985d13ac98e66f2633ea93bb21b7 (patch) | |
| tree | a9f8030573b9bb69cfe7c3ed1e2891bcfbc88128 | |
| parent | 989aed22867ae64acb191e26b9dea00c3cbd26c8 (diff) | |
| download | twilio-php-daea77c1f476985d13ac98e66f2633ea93bb21b7.zip twilio-php-daea77c1f476985d13ac98e66f2633ea93bb21b7.tar.gz twilio-php-daea77c1f476985d13ac98e66f2633ea93bb21b7.tar.bz2 | |
Add tests surrounding fromJson vs. parse
Utilize static parse method since both do the same thing
| -rw-r--r-- | Services/Twilio/WorkflowConfiguration.php | 2 | ||||
| -rw-r--r-- | tests/WorkflowTest.php | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Services/Twilio/WorkflowConfiguration.php b/Services/Twilio/WorkflowConfiguration.php index 5b1e073..3799e87 100644 --- a/Services/Twilio/WorkflowConfiguration.php +++ b/Services/Twilio/WorkflowConfiguration.php @@ -25,7 +25,7 @@ class WorkflowConfiguration implements JsonSerializable { } public static function fromJson($json) { - $configJSON = json_decode($json); + $configJSON = self::parse($json); $filters = $configJSON->task_routing->filters; $default_filter = $configJSON->task_routing->default_filter; // aggressive check to see if filter_friendly_name is used diff --git a/tests/WorkflowTest.php b/tests/WorkflowTest.php index 4183e28..bae3743 100644 --- a/tests/WorkflowTest.php +++ b/tests/WorkflowTest.php @@ -284,8 +284,10 @@ class WorkflowTest extends PHPUnit_Framework_TestCase } }"; - $config = WorkflowConfiguration::parse($json); + $config = WorkflowConfiguration::fromJson($json); + $taskRoutingConfig = WorkflowConfiguration::parse($json)->task_routing; + $this->assertEquals(3, count($taskRoutingConfig->filters)); $this->assertEquals(3, count($config->filters)); $this->assertEquals(1, count($config->default_filter)); // sales assertions @@ -375,8 +377,10 @@ class WorkflowTest extends PHPUnit_Framework_TestCase } }"; - $config = WorkflowConfiguration::parse($json); + $config = WorkflowConfiguration::fromJson($json); + $taskRoutingConfig = WorkflowConfiguration::parse($json)->task_routing; + $this->assertEquals(3, count($taskRoutingConfig->filters)); $this->assertEquals(3, count($config->filters)); $this->assertEquals(1, count($config->default_filter)); // sales assertions |