Set correct value for channel in constructor

Fixes maknz#3. This was a typo where username from the config was being used for the channel provided through the constructor. This affected users wanting to use the default channel in the config rather than using an explicit to() at runtime.
mcampbell508 · Sep 26, 2014 · cb4acd2 · cb4acd2
1 parent f559d6f
commit cb4acd2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/Maknz/Slack/Client.php b/src/Maknz/Slack/Client.php
@@ -69,16 +69,16 @@ class Client {
   /**
    * Instantiate a new client
    *
-   * @param array $config
-   * @param \GuzzleHttp\Client $guzzle
+   * @param string $endpoint The Slack webhook
    * @param array $attributes
+   * @param \GuzzleHttp\Client $guzzle
    * @return void
    */
   public function __construct($endpoint, array $attributes = [], Guzzle $guzzle = null)
   {
     $this->setEndpoint($endpoint);
 
-    if (isset($attributes['channel'])) $this->setChannel($attributes['username']);
+    if (isset($attributes['channel'])) $this->setChannel($attributes['channel']);
 
     if (isset($attributes['username'])) $this->setUsername($attributes['username']);
 

diff --git a/tests/ClientUnitTest.php b/tests/ClientUnitTest.php
@@ -149,6 +149,25 @@ public function testSetIconToUrl()
     $this->assertEquals('http://www.fake.com/someimage.png', $client->getIcon());
   }
 
+  public function testInstantiationSetsCorrectValues()
+  {
+    $data = [
+      'channel' => '#test',
+      'username' => 'Test Username',
+      'icon' => ':heart_eyes:'
+    ];
+
+    $client = new Client($this->getEndpoint(), $data);
+
+    $this->assertEquals('#test', $client->getChannel());
+
+    $this->assertEquals('Test Username', $client->getUsername());
+
+    $this->assertEquals(':heart_eyes:', $client->getIcon());
+
+    $this->assertEquals(Client::ICON_TYPE_EMOJI, $client->getIconType());
+  }
+
   private function getClient()
   {
     return new Client($this->getEndpoint());