Minor adjustments API Mattermost

[ci skip]

4 files changed, 15 insertions, 16 deletions

diff --git a/spec/fixtures/mattermost_new_command.json b/spec/fixtures/mattermost_new_command.json
deleted file mode 100644
index 4b827f19926..00000000000
--- a/spec/fixtures/mattermost_new_command.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"y8j1nexrdirj5nubq5uzdwwidr","token":"pzajm5hfbtni3r49ujpt8betpc","create_at":1481897117122,"update_at":1481897117122,"delete_at":0,"creator_id":"78nm4euoc7dypergdc13ekxgpo","team_id":"w59qt5a817f69jkxdz6xe7y4ir","trigger":"display","method":"P","username":"GitLab","icon_url":"","auto_complete":false,"auto_complete_desc":"","auto_complete_hint":"","display_name":"Display name","description":"the description","url":"http://trigger.url/trigger"}
diff --git a/spec/lib/mattermost/command_spec.rb b/spec/lib/mattermost/command_spec.rb
index 7c6457f639d..8c4b12c4d03 100644
--- a/spec/lib/mattermost/command_spec.rb
+++ b/spec/lib/mattermost/command_spec.rb
@@ -1,17 +1,14 @@
 require 'spec_helper'
 
 describe Mattermost::Command do
-  describe '.create' do
-    let(:new_command) do
-      JSON.parse(File.read(Rails.root.join('spec/fixtures/', 'mattermost_new_command.json')))
-    end
+  let(:session) { double("session") }
 
+  describe '.create' do
     it 'gets the teams' do
-      allow(described_class).to receive(:post_command).and_return(new_command)
-
-      token = described_class.create('abc', url: 'http://trigger.url/trigger', icon_url: 'http://myicon.com/icon.png')
+      allow(session).to receive(:post).and_return('token' => 'token')
+      expect(session).to receive(:post)
 
-      expect(token).to eq('pzajm5hfbtni3r49ujpt8betpc')
+      described_class.create(session, 'abc', url: 'http://trigger.com')
     end
   end
 end
diff --git a/spec/lib/mattermost/session_spec.rb b/spec/lib/mattermost/session_spec.rb
index 752ac796b1c..3c2eddbd221 100644
--- a/spec/lib/mattermost/session_spec.rb
+++ b/spec/lib/mattermost/session_spec.rb
@@ -96,4 +96,4 @@ describe Mattermost::Session, type: :request do
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/lib/mattermost/team_spec.rb b/spec/lib/mattermost/team_spec.rb
index 0fe6163900d..b3db2999070 100644
--- a/spec/lib/mattermost/team_spec.rb
+++ b/spec/lib/mattermost/team_spec.rb
@@ -2,20 +2,23 @@ require 'spec_helper'
 
 describe Mattermost::Team do
   describe '.team_admin' do
-    let(:init_load) do
-      JSON.parse(File.read(Rails.root.join('spec/fixtures/', 'mattermost_initial_load.json')))
-    end
+    let(:session) { double("session") }
+    let(:json) { File.read(Rails.root.join('spec/fixtures/', 'mattermost_initial_load.json')) } 
+    let(:parsed_response) { JSON.parse(json) }
 
     before do
-      allow(described_class).to receive(:initial_load).and_return(init_load)
+      allow(session).to receive(:get).with('/api/v3/users/initial_load').
+        and_return(json)
+      allow(json).to receive(:parsed_response).and_return(parsed_response)
     end
 
     it 'gets the teams' do
-      expect(described_class.team_admin.count).to be(2)
+      expect(described_class.team_admin(session).count).to be(2)
     end
 
     it 'filters on being team admin' do
-      ids = described_class.team_admin.map { |team| team['id'] }
+      ids = described_class.team_admin(session).map { |team| team['id'] }
+
       expect(ids).to include("w59qt5a817f69jkxdz6xe7y4ir", "my9oujxf5jy1zqdgu9rihd66do")
     end
   end