3 files changed, 41 insertions, 1 deletions
diff --git a/spec/lib/gitlab/git/blob_spec.rb b/spec/lib/gitlab/git/blob_spec.rb
index 66ba00acb7d..f3945e748ab 100644
--- a/spec/lib/gitlab/git/blob_spec.rb
+++ b/spec/lib/gitlab/git/blob_spec.rb
@@ -119,10 +119,13 @@ describe Gitlab::Git::Blob, seed_helper: true do
 
   shared_examples 'finding blobs by ID' do
     let(:raw_blob) { Gitlab::Git::Blob.raw(repository, SeedRepo::RubyBlob::ID) }
+    let(:bad_blob) { Gitlab::Git::Blob.raw(repository, SeedRepo::BigCommit::ID) }
+
     it { expect(raw_blob.id).to eq(SeedRepo::RubyBlob::ID) }
     it { expect(raw_blob.data[0..10]).to eq("require \'fi") }
     it { expect(raw_blob.size).to eq(669) }
     it { expect(raw_blob.truncated?).to be_falsey }
+    it { expect(bad_blob).to be_nil }
 
     context 'large file' do
       it 'limits the size of a large file' do
diff --git a/spec/lib/gitlab/git/hook_spec.rb b/spec/lib/gitlab/git/hook_spec.rb
index ea3e4680b1d..0ff4f3bd105 100644
--- a/spec/lib/gitlab/git/hook_spec.rb
+++ b/spec/lib/gitlab/git/hook_spec.rb
@@ -28,6 +28,7 @@ describe Gitlab::Git::Hook do
         f.write(<<-HOOK)
           echo 'regular message from the hook'
           echo 'error message from the hook' 1>&2
+          echo 'error message from the hook line 2' 1>&2
           exit 1
         HOOK
       end
@@ -73,7 +74,7 @@ describe Gitlab::Git::Hook do
 
             status, errors = hook.trigger(gl_id, blank, blank, ref)
             expect(status).to be false
-            expect(errors).to eq("error message from the hook\n")
+            expect(errors).to eq("error message from the hook<br>error message from the hook line 2<br>")
           end
         end
       end
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index c7d9f105f04..ee152872acc 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -26,6 +26,16 @@ describe Gitlab::UsageData do
         version
         uuid
         hostname
+        signup
+        ldap
+        gravatar
+        omniauth
+        reply_by_email
+        container_registry
+        gitlab_pages
+        gitlab_shared_runners
+        git
+        database
       ))
     end
 
@@ -86,6 +96,32 @@ describe Gitlab::UsageData do
     end
   end
 
+  describe '#features_usage_data_ce' do
+    subject { described_class.features_usage_data_ce }
+
+    it 'gathers feature usage data' do
+      expect(subject[:signup]).to eq(current_application_settings.signup_enabled?)
+      expect(subject[:ldap]).to eq(Gitlab.config.ldap.enabled)
+      expect(subject[:gravatar]).to eq(current_application_settings.gravatar_enabled?)
+      expect(subject[:omniauth]).to eq(Gitlab.config.omniauth.enabled)
+      expect(subject[:reply_by_email]).to eq(Gitlab::IncomingEmail.enabled?)
+      expect(subject[:container_registry]).to eq(Gitlab.config.registry.enabled)
+      expect(subject[:gitlab_shared_runners]).to eq(Gitlab.config.gitlab_ci.shared_runners_enabled)
+    end
+  end
+
+  describe '#components_usage_data' do
+    subject { described_class.components_usage_data }
+
+    it 'gathers components usage data' do
+      expect(subject[:gitlab_pages][:enabled]).to eq(Gitlab.config.pages.enabled)
+      expect(subject[:gitlab_pages][:version]).to eq(Gitlab::Pages::VERSION)
+      expect(subject[:git][:version]).to eq(Gitlab::Git.version)
+      expect(subject[:database][:adapter]).to eq(Gitlab::Database.adapter_name)
+      expect(subject[:database][:version]).to eq(Gitlab::Database.version)
+    end
+  end
+
   describe '#license_usage_data' do
     subject { described_class.license_usage_data }