WIP

lib/mattermost/command.rb

 module Mattermost
-  class Command
+  class Command < Session
     def self.all(team_id)
-      Mattermost::Mattermost.get("/teams/#{team_id}/commands/list_team_commands")
+      get("/api/v3/teams/#{team_id}/commands/list_team_commands")
     end
     # params should be a hash, which supplies _at least_:
@@ -9,7 +9,7 @@ module Mattermost
     # - url => What is the URL to trigger here?
     # - icon_url => Supply a link to the icon
     def self.create(team_id, params)
-      params = {
+      command = {
         auto_complete: true,
         auto_complete_desc: 'List all available commands',
         auto_complete_hint: '[help]',
@@ -17,10 +17,9 @@ module Mattermost
         display_name: 'GitLab',
         method: 'P',
         user_name: 'GitLab'
-      }..merge(params)
-      Mattermost::Mattermost.post( "/teams/#{team_id}/commands/create", params.to_json).
-        parsed_response['token']
+      }.merge(params)
+      post( "/api/v3/teams/#{team_id}/commands/create", command.to_json).parsed_response['token']
     end
   end
 end

lib/mattermost/session.rb

@@ -106,7 +106,6 @@ module Mattermost
     def normalize_uri(uri)
       uri << '/' unless uri.end_with?('/')
-
       uri << 'api/v3'
     end
   end

lib/mattermost/team.rb

 module Mattermost
-  class Team < Mattermost
+  class Team < Session
     # After normalization this returns an array of hashes
     #
     # [{"id"=>"paf573pj9t81urupw3fanozeda", "display_name"=>"my team", <snip>}]
     def self.all
-      @all_teams ||= get('/teams/all').parsed_response.values
+      get('/api/v3/teams/all').parsed_response.values
     end
   end
 end

spec/lib/mattermost/team_spec.rb

+require 'spec_helper'
+
+describe Mattermost::Team do
+  let(:session) { Mattermost::Session.new('http://localhost:8065/', nil) }
+
+  describe '.all' do
+    let(:result)  { {id: 'abc', display_name: 'team'} }
+    before do
+      WebMock.stub_request(:get, 'http://localhost:8065/api/v3/teams/all').
+        and_return({ abc: result }.to_json)
+    end
+
+    xit 'gets the teams' do
+      allow(session).to receive(:with_session) { yield }
+
+      expect(described_class.all).to eq(result)
+    end
+  end
+end