From 22a0567823e792bd760ced79539a0b2c4bfd8f5e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 20 Dec 2016 23:17:32 +0100
Subject: [PATCH] Fix a few error messages

---
 app/helpers/mattermost_helper.rb |  9 +++++++++
 copy.sh                          | 11 -----------
 lib/mattermost/client.rb         |  4 ++--
 lib/mattermost/session.rb        |  4 ++--
 spec/lib/mattermost/team_spec.rb |  4 +---
 5 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 app/helpers/mattermost_helper.rb
 delete mode 100755 copy.sh

diff --git a/app/helpers/mattermost_helper.rb b/app/helpers/mattermost_helper.rb
new file mode 100644
index 00000000000..49ac12db832
--- /dev/null
+++ b/app/helpers/mattermost_helper.rb
@@ -0,0 +1,9 @@
+module MattermostHelper
+  def mattermost_teams_options(teams)
+    teams_options = teams.map do |id, options|
+      [options['display_name'] || options['name'], id]
+    end
+
+    teams_options.compact.unshift(['Select team...', '0'])
+  end
+end
diff --git a/copy.sh b/copy.sh
deleted file mode 100755
index 2cdc593ef6d..00000000000
--- a/copy.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -xe
-
-# rsync --delete -av config/{routes.rb,routes,initializers,application.rb} zj-gitlab:/opt/gitlab/embedded/service/gitlab-rails/config/
-rsync --delete -av lib/mattermost zj-gitlab:/opt/gitlab/embedded/service/gitlab-rails/lib
-# rsync --delete -av vendor/{assets,gitignore,gitlab-ci-yml} zj-gitlab:/opt/gitlab/embedded/service/gitlab-rails/vendor/
-# rsync --delete -av ../gitlab-shell/{bin,lib,spec,hooks} zj-gitlab:/opt/gitlab/embedded/service/gitlab-shell
-#ssh gitlab-test 'cd /opt/gitlab/embedded/service/gitlab-rails && /opt/gitlab/embedded/bin/bundle install --deployment'
-#ssh gitlab-test 'export NO_PRIVILEGE_DROP=true; export USE_DB=false; gitlab-rake assets:precompile'
-ssh zj-gitlab gitlab-ctl restart
diff --git a/lib/mattermost/client.rb b/lib/mattermost/client.rb
index fa3c9fa27bd..ec2903b7ec6 100644
--- a/lib/mattermost/client.rb
+++ b/lib/mattermost/client.rb
@@ -30,12 +30,12 @@ module Mattermost
       json_response = JSON.parse(response.body)
 
       unless response.success?
-        raise ClientError(json_response['message'] || 'Undefined error')
+        raise Mattermost::ClientError.new(json_response['message'] || 'Undefined error')
       end
 
       json_response
     rescue JSON::JSONError
-      raise ClientError('Cannot parse response')
+      raise Mattermost::ClientError.new('Cannot parse response')
     end
   end
 end
diff --git a/lib/mattermost/session.rb b/lib/mattermost/session.rb
index 8fcd4a84af5..ddfeb88a71f 100644
--- a/lib/mattermost/session.rb
+++ b/lib/mattermost/session.rb
@@ -81,9 +81,9 @@ module Mattermost
     def post(path, options = {})
       self.class.post(path, options.merge(headers: @headers))
     rescue HTTParty::Error => e
-      raise ConnectionError(e.message)
+      raise Mattermost::ConnectionError.new(e.message)
     rescue Errno::ECONNREFUSED
-      raise ConnectionError
+      raise Mattermost::ConnectionError.new(e.message)
     end
 
     private
diff --git a/spec/lib/mattermost/team_spec.rb b/spec/lib/mattermost/team_spec.rb
index ef39c456d5f..704579f0f48 100644
--- a/spec/lib/mattermost/team_spec.rb
+++ b/spec/lib/mattermost/team_spec.rb
@@ -3,9 +3,6 @@ require 'spec_helper'
 describe Mattermost::Team do
   describe '#all' do
     let(:user) { build(:user) }
-
-    subject { described_class.new(user) }
-
     let(:response) do
       [{
         "id" => "xiyro8huptfhdndadpz8r3wnbo",
@@ -22,6 +19,7 @@ describe Mattermost::Team do
         "allow_open_invite" => false }]
     end
 
+    subject { described_class.new(user) }
 
     before do
       allow(subject).to receive(:json_get).and_return(response)