Fix specs for Bitbucket Server

app/views/import/bitbucket_server/new.html.haml

@@ -13,7 +13,7 @@
   .form-group.row
     = label_tag :bitbucket_server_url, 'Bitbucket Server URL', class: 'col-form-label col-md-2'
     .col-md-4
-      = text_field_tag :bitbucket_server_url, '', class: 'form-control append-right-8', placeholder: _('https://bitbucket-server'), size: 40
+      = text_field_tag :bitbucket_server_url, '', class: 'form-control append-right-8', placeholder: _('URL for Bitbucket Server'), size: 40
   .form-group.row
     = label_tag :bitbucket_server_url, 'Username', class: 'col-form-label col-md-2'
     .col-md-4

spec/lib/gitlab/import_sources_spec.rb

@@ -6,7 +6,8 @@ describe Gitlab::ImportSources do
       expected =
         {
           'GitHub'           => 'github',
-          'Bitbucket'     => 'bitbucket',
+          'Bitbucket Cloud'  => 'bitbucket',
+          'Bitbucket Server' => 'bitbucket_server',
           'GitLab.com'       => 'gitlab',
           'Google Code'      => 'google_code',
           'FogBugz'          => 'fogbugz',
@@ -26,6 +27,7 @@ describe Gitlab::ImportSources do
         %w(
           github
           bitbucket
+          bitbucket_server
           gitlab
           google_code
           fogbugz
@@ -45,6 +47,7 @@ describe Gitlab::ImportSources do
         %w(
           github
           bitbucket
+          bitbucket_server
           gitlab
           google_code
           fogbugz
@@ -60,6 +63,7 @@ describe Gitlab::ImportSources do
     import_sources = {
       'github' => Gitlab::GithubImport::ParallelImporter,
       'bitbucket' => Gitlab::BitbucketImport::Importer,
+      'bitbucket_server' => Gitlab::BitbucketServerImport::Importer,
       'gitlab' => Gitlab::GitlabImport::Importer,
       'google_code' => Gitlab::GoogleCodeImport::Importer,
       'fogbugz' => Gitlab::FogbugzImport::Importer,
@@ -79,7 +83,8 @@ describe Gitlab::ImportSources do
   describe '.title' do
     import_sources = {
       'github' => 'GitHub',
-      'bitbucket' => 'Bitbucket',
+      'bitbucket' => 'Bitbucket Cloud',
+      'bitbucket_server' => 'Bitbucket Server',
       'gitlab' => 'GitLab.com',
       'google_code' => 'Google Code',
       'fogbugz' => 'FogBugz',
@@ -97,7 +102,7 @@ describe Gitlab::ImportSources do
   end
 
   describe 'imports_repository? checker' do
-    let(:allowed_importers) { %w[github gitlab_project] }
+    let(:allowed_importers) { %w[github gitlab_project bitbucket_server] }
 
     it 'fails if any importer other than the allowed ones implements this method' do
       current_importers = described_class.values.select { |kind| described_class.importer(kind).try(:imports_repository?) }