summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/manifest_import/manifest_spec.rb
diff options
context:
space:
mode:
authorGreg Myers <gmyers@gitlab.com>2019-08-27 15:51:04 +0000
committerGreg Myers <gmyers@gitlab.com>2019-08-27 15:51:04 +0000
commit51a0166af2c532aa7a0d04bb503b43499be97033 (patch)
tree9ebd74e8518d573fe4860763ddb41146dab1f453 /spec/lib/gitlab/manifest_import/manifest_spec.rb
parentf706677357fcdf9cd870d098379788543ea71058 (diff)
parent27c222d16ccb666878c7ac558f484efa56f77f37 (diff)
downloadgitlab-ce-51a0166af2c532aa7a0d04bb503b43499be97033.tar.gz
Merge branch 'master' into 'api-curl-quote-url-docs'api-curl-quote-url-docs
# Conflicts: # doc/api/events.md
Diffstat (limited to 'spec/lib/gitlab/manifest_import/manifest_spec.rb')
-rw-r--r--spec/lib/gitlab/manifest_import/manifest_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/lib/gitlab/manifest_import/manifest_spec.rb b/spec/lib/gitlab/manifest_import/manifest_spec.rb
index ab305fb2316..c1135f710ea 100644
--- a/spec/lib/gitlab/manifest_import/manifest_spec.rb
+++ b/spec/lib/gitlab/manifest_import/manifest_spec.rb
@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
require 'spec_helper'
-describe Gitlab::ManifestImport::Manifest, :postgresql do
+describe Gitlab::ManifestImport::Manifest do
let(:file) { File.open(Rails.root.join('spec/fixtures/aosp_manifest.xml')) }
let(:manifest) { described_class.new(file) }