Merge branch 'fix/fogbugz-import' into 'master'

lib/gitlab/fogbugz_import/client.rb

@@ -26,7 +26,7 @@ module Gitlab
       def user_map
         users = {}
         res = @api.command(:listPeople)
-        res['people']['person'].each do |user|
+        [res['people']['person']].flatten.each do |user|
           users[user['ixPerson']] = { name: user['sFullName'], email: user['sEmail'] }
         end
         users

spec/lib/gitlab/fogbugz_import/client_spec.rb

+require 'spec_helper'
+
+describe Gitlab::FogbugzImport::Client, lib: true do
+
+  let(:client) { described_class.new(uri: '', token: '') }
+  let(:one_user) { { 'people' => { 'person' => { "ixPerson" => "2", "sFullName" => "James" } } } }
+  let(:two_users) { { 'people' => { 'person' => [one_user, { "ixPerson" => "3" }] } } }
+
+  it 'retrieves user_map with one user' do
+    stub_api(one_user)
+
+    expect(client.user_map.count).to eq(1)
+  end
+
+  it 'retrieves user_map with two users' do
+    stub_api(two_users)
+
+    expect(client.user_map.count).to eq(2)
+  end
+
+  def stub_api(users)
+    allow_any_instance_of(::Fogbugz::Interface).to receive(:command).with(:listPeople).and_return(users)
+  end
+end