Merge branch 'split-up-builds' into 'master'

Split up 20min+ `spec:other` and `spinach:project` builds to increase parallelization



See merge request !2036

.gitlab-ci.yml

@@ -24,6 +24,27 @@ spec:api:
     - ruby
     - mysql
 
+spec:models:
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
+  tags:
+    - ruby
+    - mysql
+
+spec:lib:
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
+  tags:
+    - ruby
+    - mysql
+
+spec:services:
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
+  tags:
+    - ruby
+    - mysql
+
 spec:benchmark:
   script:
     - RAILS_ENV=test bundle exec rake spec:benchmark
@@ -39,9 +60,16 @@ spec:other:
     - ruby
     - mysql
 
-spinach:project:
+spinach:project:half:
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
+  tags:
+    - ruby
+    - mysql
+
+spinach:project:rest:
   script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
   tags:
     - ruby
     - mysql

features/project/commits/branches.feature

+@project_commits
 Feature: Project Commits Branches
   Background:
     Given I sign in as a user

features/project/commits/comments.feature

+@project_commits
 Feature: Project Commits Comments
   Background:
     Given I sign in as a user

features/project/commits/commits.feature

+@project_commits
 Feature: Project Commits
   Background:
     Given I sign in as a user

features/project/commits/diff_comments.feature

+@project_commits
 Feature: Project Commits Diff Comments
   Background:
     Given I sign in as a user

features/project/commits/tags.feature

+@project_commits
 Feature: Project Commits Tags
   Background:
     Given I sign in as a user

features/project/commits/user_lookup.feature

+@project_commits
 Feature: Project Commits User Lookup
   Background:
     Given I sign in as a user

features/project/issues/award_emoji.feature

+@project_issues
 Feature: Award Emoji
   Background:
     Given I sign in as a user

features/project/issues/filter_labels.feature

+@project_issues
 Feature: Project Issues Filter Labels
   Background:
     Given I sign in as a user

features/project/issues/issues.feature

+@project_issues
 Feature: Project Issues
   Background:
     Given I sign in as a user
@@ -196,4 +197,3 @@ Feature: Project Issues
     And I should not see labels field
     And I submit new issue "500 error on profile"
     Then I should see issue "500 error on profile"
-

features/project/issues/labels.feature

+@project_issues
 Feature: Project Issues Labels
   Background:
     Given I sign in as a user

features/project/issues/milestones.feature

+@project_issues
 Feature: Project Issues Milestones
   Background:
     Given I sign in as a user

features/project/merge_requests.feature

+@project_merge_requests
 Feature: Project Merge Requests
   Background:
     Given I sign in as a user

features/project/merge_requests/accept.feature

+@project_merge_requests
 Feature: Project Merge Requests Acceptance
   Background:
     Given There is an open Merge Request

lib/tasks/spec.rake

@@ -19,6 +19,33 @@ namespace :spec do
     run_commands(cmds)
   end
 
+  desc 'GitLab | Rspec | Run model specs'
+  task :models do
+    cmds = [
+      %W(rake gitlab:setup),
+      %W(rspec spec --tag @models)
+    ]
+    run_commands(cmds)
+  end
+
+  desc 'GitLab | Rspec | Run service specs'
+  task :services do
+    cmds = [
+      %W(rake gitlab:setup),
+      %W(rspec spec --tag @services)
+    ]
+    run_commands(cmds)
+  end
+
+  desc 'GitLab | Rspec | Run lib specs'
+  task :lib do
+    cmds = [
+      %W(rake gitlab:setup),
+      %W(rspec spec --tag @lib)
+    ]
+    run_commands(cmds)
+  end
+
   desc 'GitLab | Rspec | Run benchmark specs'
   task :benchmark do
     cmds = [
@@ -32,7 +59,7 @@ namespace :spec do
   task :other do
     cmds = [
       %W(rake gitlab:setup),
-      %W(rspec spec --tag ~@api --tag ~@feature --tag ~@benchmark)
+      %W(rspec spec --tag ~@api --tag ~@feature --tag ~@models --tag ~@lib --tag ~@services --tag ~@benchmark)
     ]
     run_commands(cmds)
   end

lib/tasks/spinach.rake

 Rake::Task["spinach"].clear if Rake::Task.task_defined?('spinach')
 
 namespace :spinach do
+  namespace :project do
+    desc "GitLab | Spinach | Run project commits, issues and merge requests spinach features"
+    task :half do
+      cmds = [
+        %W(rake gitlab:setup),
+        %W(spinach --tags @project_commits,@project_issues,@project_merge_requests),
+      ]
+      run_commands(cmds)
+    end
+
+    desc "GitLab | Spinach | Run remaining project spinach features"
+    task :rest do
+      cmds = [
+        %W(rake gitlab:setup),
+        %W(spinach --tags ~@admin,~@dashboard,~@profile,~@public,~@snippets,~@project_commits,~@project_issues,~@project_merge_requests),
+      ]
+      run_commands(cmds)
+    end
+  end
+
   desc "GitLab | Spinach | Run project spinach features"
   task :project do
     cmds = [
       %W(rake gitlab:setup),
-      %W(spinach --tags ~@admin,~@dashboard,~@profile,~@public,~@snippets,~@commits),
+      %W(spinach --tags ~@admin,~@dashboard,~@profile,~@public,~@snippets),
     ]
     run_commands(cmds)
   end
@@ -14,7 +34,7 @@ namespace :spinach do
   task :other do
     cmds = [
       %W(rake gitlab:setup),
-      %W(spinach --tags @admin,@dashboard,@profile,@public,@snippets,@commits),
+      %W(spinach --tags @admin,@dashboard,@profile,@public,@snippets),
     ]
     run_commands(cmds)
   end

spec/lib/ci/ansi2html_spec.rb

 require 'spec_helper'
 
-describe Ci::Ansi2html do
+describe Ci::Ansi2html, lib: true do
   subject { Ci::Ansi2html }
 
   it "prints non-ansi as-is" do

spec/lib/ci/charts_spec.rb

 require 'spec_helper'
 
-describe "Charts" do
+describe Ci::Charts, lib: true do
 
   context "build_times" do
     before do

spec/lib/ci/gitlab_ci_yaml_processor_spec.rb

 require 'spec_helper'
 
 module Ci
-  describe GitlabCiYamlProcessor do
+  describe GitlabCiYamlProcessor, lib: true do
     let(:path) { 'path' }
     
     describe "#builds_for_ref" do

spec/lib/disable_email_interceptor_spec.rb

 require 'spec_helper'
 
-describe DisableEmailInterceptor do
+describe DisableEmailInterceptor, lib: true do
   before do
     ActionMailer::Base.register_interceptor(DisableEmailInterceptor)
   end

spec/lib/extracts_path_spec.rb

 require 'spec_helper'
 
-describe ExtractsPath do
+describe ExtractsPath, lib: true do
   include ExtractsPath
   include RepoHelpers
   include Gitlab::Application.routes.url_helpers

spec/lib/file_size_validator_spec.rb

 require 'spec_helper'
 
-describe 'Gitlab::FileSizeValidatorSpec' do
+describe FileSizeValidator, lib: true do
   let(:validator) { FileSizeValidator.new(options) }
   let(:attachment) { AttachmentUploader.new }
   let(:note) { create(:note) }

spec/lib/git_ref_validator_spec.rb

 require 'spec_helper'
 
-describe Gitlab::GitRefValidator do
+describe Gitlab::GitRefValidator, lib: true do
   it { expect(Gitlab::GitRefValidator.validate('feature/new')).to be_truthy }
   it { expect(Gitlab::GitRefValidator.validate('implement_@all')).to be_truthy }
   it { expect(Gitlab::GitRefValidator.validate('my_new_feature')).to be_truthy }

spec/lib/gitlab/asciidoc_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'nokogiri'
 
 module Gitlab
-  describe Asciidoc do
+  describe Asciidoc, lib: true do
 
     let(:input) { '<b>ascii</b>' }
     let(:context) { {} }

spec/lib/gitlab/auth_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Auth do
+describe Gitlab::Auth, lib: true do
   let(:gl_auth) { Gitlab::Auth.new }
 
   describe :find do

spec/lib/gitlab/backend/grack_auth_spec.rb

 require "spec_helper"
 
-describe Grack::Auth do
+describe Grack::Auth, lib: true do
   let(:user)    { create(:user) }
   let(:project) { create(:project) }
 

spec/lib/gitlab/backend/shell_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Shell do
+describe Gitlab::Shell, lib: true do
   let(:project) { double('Project', id: 7, path: 'diaspora') }
   let(:gitlab_shell) { Gitlab::Shell.new }
 
@@ -16,7 +16,7 @@ describe Gitlab::Shell do
 
   it { expect(gitlab_shell.url_to_repo('diaspora')).to eq(Gitlab.config.gitlab_shell.ssh_path_prefix + "diaspora.git") }
 
-  describe Gitlab::Shell::KeyAdder do
+  describe Gitlab::Shell::KeyAdder, lib: true do
     describe '#add_key' do
       it 'normalizes space characters in the key' do
         io = spy

spec/lib/gitlab/bitbucket_import/client_spec.rb

 require 'spec_helper'
 
-describe Gitlab::BitbucketImport::Client do
+describe Gitlab::BitbucketImport::Client, lib: true do
   let(:token) { '123456' }
   let(:secret) { 'secret' }
   let(:client) { Gitlab::BitbucketImport::Client.new(token, secret) }

spec/lib/gitlab/bitbucket_import/project_creator_spec.rb

 require 'spec_helper'
 
-describe Gitlab::BitbucketImport::ProjectCreator do
+describe Gitlab::BitbucketImport::ProjectCreator, lib: true do
   let(:user) { create(:user) }
   let(:repo) do
     {

spec/lib/gitlab/closing_issue_extractor_spec.rb

 require 'spec_helper'
 
-describe Gitlab::ClosingIssueExtractor do
+describe Gitlab::ClosingIssueExtractor, lib: true do
   let(:project)   { create(:project) }
   let(:project2)   { create(:project) }
   let(:issue)     { create(:issue, project: project) }

spec/lib/gitlab/color_schemes_spec.rb

 require 'spec_helper'
 
-describe Gitlab::ColorSchemes do
+describe Gitlab::ColorSchemes, lib: true do
   describe '.body_classes' do
     it 'returns a space-separated list of class names' do
       css = described_class.body_classes

spec/lib/gitlab/database_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Database do
+describe Gitlab::Database, lib: true do
   # These are just simple smoke tests to check if the methods work (regardless
   # of what they may return).
   describe '.mysql?' do

spec/lib/gitlab/diff/file_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Diff::File do
+describe Gitlab::Diff::File, lib: true do
   include RepoHelpers
 
   let(:project) { create(:project) }

spec/lib/gitlab/diff/parser_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Diff::Parser do
+describe Gitlab::Diff::Parser, lib: true do
   include RepoHelpers
 
   let(:project) { create(:project) }

spec/lib/gitlab/email/attachment_uploader_spec.rb

 require "spec_helper"
 
-describe Gitlab::Email::AttachmentUploader do
+describe Gitlab::Email::AttachmentUploader, lib: true do
   describe "#execute" do
     let(:project) { build(:project) }
     let(:message_raw) { fixture_file("emails/attachment.eml") }

spec/lib/gitlab/email/receiver_spec.rb

 require "spec_helper"
 
-describe Gitlab::Email::Receiver do
+describe Gitlab::Email::Receiver, lib: true do
   before do
     stub_incoming_email_setting(enabled: true, address: "reply+%{key}@appmail.adventuretime.ooo")
   end

spec/lib/gitlab/email/reply_parser_spec.rb

 require "spec_helper"
 
 # Inspired in great part by Discourse's Email::Receiver
-describe Gitlab::Email::ReplyParser do
+describe Gitlab::Email::ReplyParser, lib: true do
   describe '#execute' do
     def test_parse_body(mail_string)
       described_class.new(Mail::Message.new(mail_string)).execute

spec/lib/gitlab/git_access_spec.rb

 require 'spec_helper'
 
-describe Gitlab::GitAccess do
+describe Gitlab::GitAccess, lib: true do
   let(:access) { Gitlab::GitAccess.new(actor, project) }
   let(:project) { create(:project) }
   let(:user) { create(:user) }

spec/lib/gitlab/git_access_wiki_spec.rb

 require 'spec_helper'
 
-describe Gitlab::GitAccessWiki do
+describe Gitlab::GitAccessWiki, lib: true do
   let(:access) { Gitlab::GitAccessWiki.new(user, project) }
   let(:project) { create(:project) }
   let(:user) { create(:user) }

spec/lib/gitlab/github_import/client_spec.rb

 require 'spec_helper'
 
-describe Gitlab::GithubImport::Client do
+describe Gitlab::GithubImport::Client, lib: true do
   let(:token) { '123456' }
   let(:client) { Gitlab::GithubImport::Client.new(token) }
 

spec/lib/gitlab/github_import/project_creator_spec.rb

 require 'spec_helper'
 
-describe Gitlab::GithubImport::ProjectCreator do
+describe Gitlab::GithubImport::ProjectCreator, lib: true do
   let(:user) { create(:user) }
   let(:repo) do
     OpenStruct.new(

spec/lib/gitlab/gitlab_import/client_spec.rb

 require 'spec_helper'
 
-describe Gitlab::GitlabImport::Client do
+describe Gitlab::GitlabImport::Client, lib: true do
   let(:token) { '123456' }
   let(:client) { Gitlab::GitlabImport::Client.new(token) }
 

spec/lib/gitlab/gitlab_import/project_creator_spec.rb

 require 'spec_helper'
 
-describe Gitlab::GitlabImport::ProjectCreator do
+describe Gitlab::GitlabImport::ProjectCreator, lib: true do
   let(:user) { create(:user) }
   let(:repo) do
     {

spec/lib/gitlab/gitorious_import/project_creator_spec.rb

 require 'spec_helper'
 
-describe Gitlab::GitoriousImport::ProjectCreator do
+describe Gitlab::GitoriousImport::ProjectCreator, lib: true do
   let(:user) { create(:user) }
   let(:repo) { Gitlab::GitoriousImport::Repository.new('foo/bar-baz-qux') }
   let(:namespace){ create(:group, owner: user) }

spec/lib/gitlab/google_code_import/client_spec.rb

 require "spec_helper"
 
-describe Gitlab::GoogleCodeImport::Client do
+describe Gitlab::GoogleCodeImport::Client, lib: true do
   let(:raw_data) { JSON.parse(fixture_file("GoogleCodeProjectHosting.json")) }
   subject { described_class.new(raw_data) }
 

spec/lib/gitlab/google_code_import/importer_spec.rb

 require "spec_helper"
 
-describe Gitlab::GoogleCodeImport::Importer do
+describe Gitlab::GoogleCodeImport::Importer, lib: true do
   let(:mapped_user) { create(:user, username: "thilo123") }
   let(:raw_data) { JSON.parse(fixture_file("GoogleCodeProjectHosting.json")) }
   let(:client) { Gitlab::GoogleCodeImport::Client.new(raw_data) }

spec/lib/gitlab/google_code_import/project_creator_spec.rb

 require 'spec_helper'
 
-describe Gitlab::GoogleCodeImport::ProjectCreator do
+describe Gitlab::GoogleCodeImport::ProjectCreator, lib: true do
   let(:user) { create(:user) }
   let(:repo) do
     Gitlab::GoogleCodeImport::Repository.new(

spec/lib/gitlab/incoming_email_spec.rb

 require "spec_helper"
 
-describe Gitlab::IncomingEmail do
+describe Gitlab::IncomingEmail, lib: true do
   describe "self.enabled?" do
     context "when reply by email is enabled" do
       before do

spec/lib/gitlab/inline_diff_spec.rb

 require 'spec_helper'
 
-describe Gitlab::InlineDiff do
+describe Gitlab::InlineDiff, lib: true do
   describe '#processing' do
     let(:diff) do
       <<eos

spec/lib/gitlab/key_fingerprint_spec.rb

 require "spec_helper"
 
-describe Gitlab::KeyFingerprint do
+describe Gitlab::KeyFingerprint, lib: true do
   let(:key)         { "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=" }
   let(:fingerprint) { "3f:a2:ee:de:b5:de:53:c3:aa:2f:9c:45:24:4c:47:7b" }
 

spec/lib/gitlab/ldap/access_spec.rb

 require 'spec_helper'
 
-describe Gitlab::LDAP::Access do
+describe Gitlab::LDAP::Access, lib: true do
   let(:access) { Gitlab::LDAP::Access.new user }
   let(:user) { create(:omniauth_user) }
 

spec/lib/gitlab/ldap/adapter_spec.rb

 require 'spec_helper'
 
-describe Gitlab::LDAP::Adapter do
+describe Gitlab::LDAP::Adapter, lib: true do
   let(:adapter) { Gitlab::LDAP::Adapter.new 'ldapmain' }
 
   describe '#dn_matches_filter?' do

spec/lib/gitlab/ldap/auth_hash_spec.rb

 require 'spec_helper'
 
-describe Gitlab::LDAP::AuthHash do
+describe Gitlab::LDAP::AuthHash, lib: true do
   let(:auth_hash) do
     Gitlab::LDAP::AuthHash.new(
       OmniAuth::AuthHash.new(

spec/lib/gitlab/ldap/authentication_spec.rb

 require 'spec_helper'
 
-describe Gitlab::LDAP::Authentication do
+describe Gitlab::LDAP::Authentication, lib: true do
   let(:user)     { create(:omniauth_user, extern_uid: dn) }
   let(:dn)       { 'uid=john,ou=people,dc=example,dc=com' }
   let(:login)    { 'john' }

spec/lib/gitlab/ldap/config_spec.rb

 require 'spec_helper'
 
-describe Gitlab::LDAP::Config do
+describe Gitlab::LDAP::Config, lib: true do
   let(:config) { Gitlab::LDAP::Config.new provider }
   let(:provider) { 'ldapmain' }
 

spec/lib/gitlab/ldap/user_spec.rb

 require 'spec_helper'
 
-describe Gitlab::LDAP::User do
+describe Gitlab::LDAP::User, lib: true do
   let(:ldap_user) { Gitlab::LDAP::User.new(auth_hash) }
   let(:gl_user) { ldap_user.gl_user }
   let(:info) do

spec/lib/gitlab/lfs/lfs_router_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Lfs::Router do
+describe Gitlab::Lfs::Router, lib: true do
   let(:project) { create(:project) }
   let(:public_project) { create(:project, :public) }
   let(:forked_project) { fork_project(public_project, user) }

spec/lib/gitlab/markdown/autolink_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe AutolinkFilter do
+  describe AutolinkFilter, lib: true do
     include FilterSpecHelper
 
     let(:link) { 'http://about.gitlab.com/' }

spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe CommitRangeReferenceFilter do
+  describe CommitRangeReferenceFilter, lib: true do
     include FilterSpecHelper
 
     let(:project) { create(:project, :public) }

spec/lib/gitlab/markdown/commit_reference_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe CommitReferenceFilter do
+  describe CommitReferenceFilter, lib: true do
     include FilterSpecHelper
 
     let(:project) { create(:project, :public) }

spec/lib/gitlab/markdown/cross_project_reference_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe CrossProjectReference do
+  describe CrossProjectReference, lib: true do
     include described_class
 
     describe '#project_from_ref' do

spec/lib/gitlab/markdown/emoji_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe EmojiFilter do
+  describe EmojiFilter, lib: true do
     include FilterSpecHelper
 
     before do

spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe ExternalIssueReferenceFilter do
+  describe ExternalIssueReferenceFilter, lib: true do
     include FilterSpecHelper
 
     def helper

spec/lib/gitlab/markdown/external_link_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe ExternalLinkFilter do
+  describe ExternalLinkFilter, lib: true do
     include FilterSpecHelper
 
     it 'ignores elements without an href attribute' do

spec/lib/gitlab/markdown/issue_reference_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe IssueReferenceFilter do
+  describe IssueReferenceFilter, lib: true do
     include FilterSpecHelper
 
     def helper

spec/lib/gitlab/markdown/label_reference_filter_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'html/pipeline'
 
 module Gitlab::Markdown
-  describe LabelReferenceFilter do
+  describe LabelReferenceFilter, lib: true do
     include FilterSpecHelper
 
     let(:project)   { create(:empty_project, :public) }

spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe MergeRequestReferenceFilter do
+  describe MergeRequestReferenceFilter, lib: true do
     include FilterSpecHelper
 
     let(:project) { create(:project, :public) }

spec/lib/gitlab/markdown/redactor_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe RedactorFilter do
+  describe RedactorFilter, lib: true do
     include ActionView::Helpers::UrlHelper
     include FilterSpecHelper
 

spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe ReferenceGathererFilter do
+  describe ReferenceGathererFilter, lib: true do
     include ActionView::Helpers::UrlHelper
     include FilterSpecHelper
 

spec/lib/gitlab/markdown/relative_link_filter_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe RelativeLinkFilter do
+  describe RelativeLinkFilter, lib: true do
     def filter(doc, contexts = {})
       contexts.reverse_merge!({
         commit:         project.commit,

spec/lib/gitlab/markdown/sanitization_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe SanitizationFilter do
+  describe SanitizationFilter, lib: true do
     include FilterSpecHelper
 
     describe 'default whitelist' do

spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe SnippetReferenceFilter do
+  describe SnippetReferenceFilter, lib: true do
     include FilterSpecHelper
 
     let(:project)   { create(:empty_project, :public) }

spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe SyntaxHighlightFilter do
+  describe SyntaxHighlightFilter, lib: true do
     include FilterSpecHelper
 
     it 'highlights valid code blocks' do

spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe TableOfContentsFilter do
+  describe TableOfContentsFilter, lib: true do
     include FilterSpecHelper
 
     def header(level, text)

spec/lib/gitlab/markdown/task_list_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe TaskListFilter do
+  describe TaskListFilter, lib: true do
     include FilterSpecHelper
 
     it 'does not apply `task-list` class to non-task lists' do

spec/lib/gitlab/markdown/upload_link_filter_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe UploadLinkFilter do
+  describe UploadLinkFilter, lib: true do
     def filter(doc, contexts = {})
       contexts.reverse_merge!({
         project: project

spec/lib/gitlab/markdown/user_reference_filter_spec.rb

 require 'spec_helper'
 
 module Gitlab::Markdown
-  describe UserReferenceFilter do
+  describe UserReferenceFilter, lib: true do
     include FilterSpecHelper
 
     let(:project)   { create(:empty_project, :public) }

spec/lib/gitlab/markup_helper_spec.rb

 require 'spec_helper'
 
-describe Gitlab::MarkupHelper do
+describe Gitlab::MarkupHelper, lib: true do
   describe '#markup?' do
     %w(textile rdoc org creole wiki
        mediawiki rst adoc ad asciidoc mdown md markdown).each do |type|

spec/lib/gitlab/note_data_builder_spec.rb

 require 'spec_helper'
 
-describe 'Gitlab::NoteDataBuilder' do
+describe 'Gitlab::NoteDataBuilder', lib: true do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:data) { Gitlab::NoteDataBuilder.build(note, user) }

spec/lib/gitlab/o_auth/auth_hash_spec.rb

 require 'spec_helper'
 
-describe Gitlab::OAuth::AuthHash do
+describe Gitlab::OAuth::AuthHash, lib: true do
   let(:auth_hash) do
     Gitlab::OAuth::AuthHash.new(
       OmniAuth::AuthHash.new(

spec/lib/gitlab/o_auth/user_spec.rb

 require 'spec_helper'
 
-describe Gitlab::OAuth::User do
+describe Gitlab::OAuth::User, lib: true do
   let(:oauth_user) { Gitlab::OAuth::User.new(auth_hash) }
   let(:gl_user) { oauth_user.gl_user }
   let(:uid) { 'my-uid' }

spec/lib/gitlab/popen_spec.rb

 require 'spec_helper'
 
-describe 'Gitlab::Popen', no_db: true do
+describe 'Gitlab::Popen', lib: true, no_db: true do
   let(:path) { Rails.root.join('tmp').to_s }
 
   before do

spec/lib/gitlab/project_search_results_spec.rb

 require 'spec_helper'
 
-describe Gitlab::ProjectSearchResults do
+describe Gitlab::ProjectSearchResults, lib: true do
   let(:project) { create(:project) }
   let(:query) { 'hello world' }
 

spec/lib/gitlab/push_data_builder_spec.rb

 require 'spec_helper'
 
-describe 'Gitlab::PushDataBuilder' do
+describe 'Gitlab::PushDataBuilder', lib: true do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
 

spec/lib/gitlab/reference_extractor_spec.rb

 require 'spec_helper'
 
-describe Gitlab::ReferenceExtractor do
+describe Gitlab::ReferenceExtractor, lib: true do
   let(:project) { create(:project) }
   subject { Gitlab::ReferenceExtractor.new(project, project.creator) }
 

spec/lib/gitlab/regex_spec.rb

 # coding: utf-8
 require 'spec_helper'
 
-describe Gitlab::Regex do
+describe Gitlab::Regex, lib: true do
   describe 'project path regex' do
     it { expect('gitlab-ce').to match(Gitlab::Regex.project_path_regex) }
     it { expect('gitlab_git').to match(Gitlab::Regex.project_path_regex) }

spec/lib/gitlab/sherlock/collection_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Sherlock::Collection do
+describe Gitlab::Sherlock::Collection, lib: true do
   let(:collection) { described_class.new }
 
   let(:transaction) do

spec/lib/gitlab/sherlock/file_sample_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Sherlock::FileSample do
+describe Gitlab::Sherlock::FileSample, lib: true do
   let(:sample) { described_class.new(__FILE__, [], 150.4, 2) }
 
   describe '#id' do

spec/lib/gitlab/sherlock/line_profiler_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Sherlock::LineProfiler do
+describe Gitlab::Sherlock::LineProfiler, lib: true do
   let(:profiler) { described_class.new }
 
   describe '#profile' do

spec/lib/gitlab/sherlock/line_sample_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Sherlock::LineSample do
+describe Gitlab::Sherlock::LineSample, lib: true do
   let(:sample) { described_class.new(150.0, 4) }
 
   describe '#duration' do

spec/lib/gitlab/sherlock/location_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Sherlock::Location do
+describe Gitlab::Sherlock::Location, lib: true do
   let(:location) { described_class.new(__FILE__, 1) }
 
   describe 'from_ruby_location' do

spec/lib/gitlab/sherlock/middleware_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Sherlock::Middleware do
+describe Gitlab::Sherlock::Middleware, lib: true do
   let(:app) { double(:app) }
   let(:middleware) { described_class.new(app) }
 

spec/lib/gitlab/sherlock/query_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Sherlock::Query do
+describe Gitlab::Sherlock::Query, lib: true do
   let(:started_at)  { Time.utc(2015, 1, 1) }
   let(:finished_at) { started_at + 5 }
 

spec/lib/gitlab/sherlock/transaction_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Sherlock::Transaction do
+describe Gitlab::Sherlock::Transaction, lib: true do
   let(:transaction) { described_class.new('POST', '/cat_pictures') }
 
   describe '#id' do

spec/lib/gitlab/sql/union_spec.rb

 require 'spec_helper'
 
-describe Gitlab::SQL::Union do
+describe Gitlab::SQL::Union, lib: true do
   describe '#to_sql' do
     it 'returns a String joining relations together using a UNION' do
       rel1  = User.where(email: 'alice@example.com')

spec/lib/gitlab/themes_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Themes do
+describe Gitlab::Themes, lib: true do
   describe '.body_classes' do
     it 'returns a space-separated list of class names' do
       css = described_class.body_classes

spec/lib/gitlab/upgrader_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Upgrader do
+describe Gitlab::Upgrader, lib: true do
   let(:upgrader) { Gitlab::Upgrader.new }
   let(:current_version) { Gitlab::VERSION }
 

spec/lib/gitlab/uploads_transfer_spec.rb

 require 'spec_helper'
 
-describe Gitlab::UploadsTransfer do
+describe Gitlab::UploadsTransfer, lib: true do
   before do
     @root_dir = File.join(Rails.root, "public", "uploads")
     @upload_transfer = Gitlab::UploadsTransfer.new

spec/lib/gitlab/url_builder_spec.rb

 require 'spec_helper'
 
-describe Gitlab::UrlBuilder do
+describe Gitlab::UrlBuilder, lib: true do
   describe 'When asking for an issue' do
     it 'returns the issue url' do
       issue = create(:issue)

spec/lib/gitlab/version_info_spec.rb

 require 'spec_helper'
 
-describe 'Gitlab::VersionInfo', no_db: true do
+describe 'Gitlab::VersionInfo', lib: true, no_db: true do
   before do
     @unknown = Gitlab::VersionInfo.new
     @v0_0_1 = Gitlab::VersionInfo.new(0, 0, 1)

spec/lib/repository_cache_spec.rb

 require_relative '../../lib/repository_cache'
 
-describe RepositoryCache do
+describe RepositoryCache, lib: true do
   let(:backend) { double('backend').as_null_object }
   let(:cache) { RepositoryCache.new('example', backend) }
 

spec/models/broadcast_message_spec.rb

@@ -15,7 +15,7 @@
 
 require 'spec_helper'
 
-describe BroadcastMessage do
+describe BroadcastMessage, models: true do
   subject { create(:broadcast_message) }
 
   it { is_expected.to be_valid }

spec/models/build_spec.rb

@@ -25,7 +25,7 @@
 
 require 'spec_helper'
 
-describe Ci::Build do
+describe Ci::Build, models: true do
   let(:project) { FactoryGirl.create :ci_project }
   let(:gl_project) { FactoryGirl.create :empty_project, gitlab_ci_project: project }
   let(:commit) { FactoryGirl.create :ci_commit, gl_project: gl_project }

spec/models/ci/commit_spec.rb

@@ -18,7 +18,7 @@
 
 require 'spec_helper'
 
-describe Ci::Commit do
+describe Ci::Commit, models: true do
   let(:project) { FactoryGirl.create :ci_project }
   let(:gl_project) { FactoryGirl.create :empty_project, gitlab_ci_project: project }
   let(:commit) { FactoryGirl.create :ci_commit, gl_project: gl_project }

spec/models/ci/project_services/hip_chat_message_spec.rb

 require 'spec_helper'
 
-describe Ci::HipChatMessage do
+describe Ci::HipChatMessage, models: true do
   subject { Ci::HipChatMessage.new(build) }
 
   let(:commit) { FactoryGirl.create(:ci_commit_with_two_jobs) }

spec/models/ci/project_services/hip_chat_service_spec.rb

@@ -15,7 +15,7 @@
 
 require 'spec_helper'
 
-describe Ci::HipChatService do
+describe Ci::HipChatService, models: true do
 
   describe "Validations" do
 

spec/models/ci/project_services/mail_service_spec.rb

@@ -14,7 +14,7 @@
 
 require 'spec_helper'
 
-describe Ci::MailService do
+describe Ci::MailService, models: true do
   describe "Associations" do
     it { is_expected.to belong_to :project }
   end

spec/models/ci/project_services/slack_message_spec.rb

 require 'spec_helper'
 
-describe Ci::SlackMessage do
+describe Ci::SlackMessage, models: true do
   subject { Ci::SlackMessage.new(commit) }
 
   let(:commit) { FactoryGirl.create(:ci_commit_with_two_jobs) }

spec/models/ci/project_services/slack_service_spec.rb

@@ -14,7 +14,7 @@
 
 require 'spec_helper'
 
-describe Ci::SlackService do
+describe Ci::SlackService, models: true do
   describe "Associations" do
     it { is_expected.to belong_to :project }
   end

spec/models/ci/project_spec.rb

@@ -27,7 +27,7 @@
 
 require 'spec_helper'
 
-describe Ci::Project do
+describe Ci::Project, models: true do
   let(:project) { FactoryGirl.create :ci_project }
   let(:gl_project) { project.gl_project }
   subject { project }

spec/models/ci/runner_project_spec.rb

@@ -11,6 +11,6 @@
 
 require 'spec_helper'
 
-describe Ci::RunnerProject do
+describe Ci::RunnerProject, models: true do
   pending "add some examples to (or delete) #{__FILE__}"
 end

spec/models/ci/runner_spec.rb

@@ -19,7 +19,7 @@
 
 require 'spec_helper'
 
-describe Ci::Runner do
+describe Ci::Runner, models: true do
   describe '#display_name' do
     it 'should return the description if it has a value' do
       runner = FactoryGirl.build(:ci_runner, description: 'Linux/Ruby-1.9.3-p448')

spec/models/ci/service_spec.rb

@@ -14,7 +14,7 @@
 
 require 'spec_helper'
 
-describe Ci::Service do
+describe Ci::Service, models: true do
 
   describe "Associations" do
     it { is_expected.to belong_to :project }

spec/models/ci/trigger_spec.rb

@@ -12,7 +12,7 @@
 
 require 'spec_helper'
 
-describe Ci::Trigger do
+describe Ci::Trigger, models: true do
   let(:project) { FactoryGirl.create :ci_project }
 
   describe 'before_validation' do

spec/models/ci/variable_spec.rb

@@ -13,7 +13,7 @@
 
 require 'spec_helper'
 
-describe Ci::Variable do
+describe Ci::Variable, models: true do
   subject { Ci::Variable.new }
 
   let(:secret_value) { 'secret' }

spec/models/ci/web_hook_spec.rb

@@ -11,7 +11,7 @@
 
 require 'spec_helper'
 
-describe Ci::WebHook do
+describe Ci::WebHook, models: true do
   describe "Associations" do
     it { is_expected.to belong_to :project }
   end

spec/models/commit_range_spec.rb

 require 'spec_helper'
 
-describe CommitRange do
+describe CommitRange, models: true do
   describe 'modules' do
     subject { described_class }
 

spec/models/commit_spec.rb

 require 'spec_helper'
 
-describe Commit do
+describe Commit, models: true do
   let(:project) { create(:project) }
   let(:commit)  { project.commit }
 

spec/models/commit_status_spec.rb

@@ -33,7 +33,7 @@
 
 require 'spec_helper'
 
-describe CommitStatus do
+describe CommitStatus, models: true do
   let(:commit) { FactoryGirl.create :ci_commit }
   let(:commit_status) { FactoryGirl.create :commit_status, commit: commit }
 

spec/models/concerns/case_sensitivity_spec.rb

 require 'spec_helper'
 
-describe CaseSensitivity do
+describe CaseSensitivity, models: true do
   describe '.iwhere' do
     let(:connection) { ActiveRecord::Base.connection }
     let(:model)      { Class.new { include CaseSensitivity } }

spec/models/deploy_key_spec.rb

@@ -15,7 +15,7 @@
 
 require 'spec_helper'
 
-describe DeployKey do
+describe DeployKey, models: true do
   let(:project) { create(:project) }
   let(:deploy_key) { create(:deploy_key, projects: [project]) }
 

spec/models/deploy_keys_project_spec.rb

@@ -11,7 +11,7 @@
 
 require 'spec_helper'
 
-describe DeployKeysProject do
+describe DeployKeysProject, models: true do
   describe "Associations" do
     it { is_expected.to belong_to(:deploy_key) }
     it { is_expected.to belong_to(:project) }

spec/models/event_spec.rb

@@ -16,7 +16,7 @@
 
 require 'spec_helper'
 
-describe Event do
+describe Event, models: true do
   describe "Associations" do
     it { is_expected.to belong_to(:project) }
     it { is_expected.to belong_to(:target) }

spec/models/external_issue_spec.rb

 require 'spec_helper'
 
-describe ExternalIssue do
+describe ExternalIssue, models: true do
   let(:project) { double('project', to_reference: 'namespace1/project1') }
   let(:issue)   { described_class.new('EXT-1234', project) }
 

spec/models/external_wiki_service_spec.rb

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe ExternalWikiService do
+describe ExternalWikiService, models: true do
   include ExternalWikiHelper
   describe "Associations" do
     it { should belong_to :project }

spec/models/generic_commit_status_spec.rb

@@ -33,7 +33,7 @@
 
 require 'spec_helper'
 
-describe GenericCommitStatus do
+describe GenericCommitStatus, models: true do
   let(:commit) { FactoryGirl.create :ci_commit }
   let(:generic_commit_status) { FactoryGirl.create :generic_commit_status, commit: commit }
 

spec/models/global_milestone_spec.rb

 require 'spec_helper'
 
-describe GlobalMilestone do
+describe GlobalMilestone, models: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:group) { create(:group) }

spec/models/group_spec.rb

@@ -16,7 +16,7 @@
 
 require 'spec_helper'
 
-describe Group do
+describe Group, models: true do
   let!(:group) { create(:group) }
 
   describe 'associations' do

spec/models/hooks/project_hook_spec.rb

@@ -18,7 +18,7 @@
 
 require 'spec_helper'
 
-describe ProjectHook do
+describe ProjectHook, models: true do
   describe '.push_hooks' do
     it 'should return hooks for push events only' do
       hook = create(:project_hook, push_events: true)

spec/models/hooks/service_hook_spec.rb

@@ -18,7 +18,7 @@
 
 require "spec_helper"
 
-describe ServiceHook do
+describe ServiceHook, models: true do
   describe "Associations" do
     it { is_expected.to belong_to :service }
   end

spec/models/hooks/system_hook_spec.rb

@@ -18,7 +18,7 @@
 
 require "spec_helper"
 
-describe SystemHook do
+describe SystemHook, models: true do
   describe "execute" do
     before(:each) do
       @system_hook = create(:system_hook)

spec/models/hooks/web_hook_spec.rb

@@ -18,7 +18,7 @@
 
 require 'spec_helper'
 
-describe ProjectHook do
+describe ProjectHook, models: true do
   describe "Associations" do
     it { is_expected.to belong_to :project }
   end

spec/models/issue_spec.rb

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe Issue do
+describe Issue, models: true do
   describe "Associations" do
     it { is_expected.to belong_to(:milestone) }
   end

spec/models/key_spec.rb

@@ -15,7 +15,7 @@
 
 require 'spec_helper'
 
-describe Key do
+describe Key, models: true do
   describe "Associations" do
     it { is_expected.to belong_to(:user) }
   end

spec/models/label_link_spec.rb

@@ -12,7 +12,7 @@
 
 require 'spec_helper'
 
-describe LabelLink do
+describe LabelLink, models: true do
   let(:label) { create(:label_link) }
   it { expect(label).to be_valid }
 

spec/models/label_spec.rb

@@ -13,7 +13,7 @@
 
 require 'spec_helper'
 
-describe Label do
+describe Label, models: true do
   let(:label) { create(:label) }
 
   describe 'associations' do

spec/models/member_spec.rb

@@ -19,7 +19,7 @@
 
 require 'spec_helper'
 
-describe Member do
+describe Member, models: true do
   describe "Associations" do
     it { is_expected.to belong_to(:user) }
   end

spec/models/members/group_member_spec.rb

@@ -19,7 +19,7 @@
 
 require 'spec_helper'
 
-describe GroupMember do
+describe GroupMember, models: true do
   context 'notification' do
     describe "#after_create" do
       it "should send email to user" do

spec/models/members/project_member_spec.rb

@@ -19,7 +19,7 @@
 
 require 'spec_helper'
 
-describe ProjectMember do
+describe ProjectMember, models: true do
   describe :import_team do
     before do
       @abilities = Six.new

spec/models/merge_request_spec.rb

@@ -25,7 +25,7 @@
 
 require 'spec_helper'
 
-describe MergeRequest do
+describe MergeRequest, models: true do
   subject { create(:merge_request) }
 
   describe 'associations' do

spec/models/milestone_spec.rb

@@ -15,7 +15,7 @@
 
 require 'spec_helper'
 
-describe Milestone do
+describe Milestone, models: true do
   describe "Associations" do
     it { is_expected.to belong_to(:project) }
     it { is_expected.to have_many(:issues) }

spec/models/namespace_spec.rb

@@ -16,7 +16,7 @@
 
 require 'spec_helper'
 
-describe Namespace do
+describe Namespace, models: true do
   let!(:namespace) { create(:namespace) }
 
   it { is_expected.to have_many :projects }

spec/models/note_spec.rb

@@ -21,7 +21,7 @@
 
 require 'spec_helper'
 
-describe Note do
+describe Note, models: true do
   describe 'associations' do
     it { is_expected.to belong_to(:project) }
     it { is_expected.to belong_to(:noteable) }

spec/models/project_security_spec.rb

 require 'spec_helper'
 
-describe Project do
+describe Project, models: true do
   describe :authorization do
     before do
       @p1 = create(:project)

spec/models/project_services/buildkite_service_spec.rb

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe BuildkiteService do
+describe BuildkiteService, models: true do
   describe 'Associations' do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }

spec/models/project_services/drone_ci_service_spec.rb

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe DroneCiService do
+describe DroneCiService, models: true do
   describe 'associations' do
     it { is_expected.to belong_to(:project) }
     it { is_expected.to have_one(:service_hook) }

spec/models/project_services/flowdock_service_spec.rb

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe FlowdockService do
+describe FlowdockService, models: true do
   describe "Associations" do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }

spec/models/project_services/gemnasium_service_spec.rb

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe GemnasiumService do
+describe GemnasiumService, models: true do
   describe "Associations" do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }

spec/models/project_services/gitlab_ci_service_spec.rb

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe GitlabCiService do
+describe GitlabCiService, models: true do
   describe 'associations' do
     it { is_expected.to belong_to(:project) }
     it { is_expected.to have_one(:service_hook) }

spec/models/project_services/gitlab_issue_tracker_service_spec.rb

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe GitlabIssueTrackerService do
+describe GitlabIssueTrackerService, models: true do
   describe "Associations" do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }

spec/models/project_services/hipchat_service_spec.rb

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe HipchatService do
+describe HipchatService, models: true do
   describe "Associations" do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }

spec/models/project_services/irker_service_spec.rb

@@ -22,7 +22,7 @@ require 'spec_helper'
 require 'socket'
 require 'json'
 
-describe IrkerService do
+describe IrkerService, models: true do
   describe 'Associations' do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }

spec/models/project_services/jira_service_spec.rb

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe JiraService do
+describe JiraService, models: true do
   describe "Associations" do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }

spec/models/project_services/pushover_service_spec.rb

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe PushoverService do
+describe PushoverService, models: true do
   describe 'Associations' do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }

spec/models/project_services/slack_service/issue_message_spec.rb

 require 'spec_helper'
 
-describe SlackService::IssueMessage do
+describe SlackService::IssueMessage, models: true do
   subject { SlackService::IssueMessage.new(args) }
 
   let(:args) do

spec/models/project_services/slack_service/merge_message_spec.rb

 require 'spec_helper'
 
-describe SlackService::MergeMessage do
+describe SlackService::MergeMessage, models: true do
   subject { SlackService::MergeMessage.new(args) }
 
   let(:args) do

spec/models/project_services/slack_service/note_message_spec.rb

 require 'spec_helper'
 
-describe SlackService::NoteMessage do
+describe SlackService::NoteMessage, models: true do
   let(:color) { '#345' }
 
   before do

spec/models/project_services/slack_service/push_message_spec.rb

 require 'spec_helper'
 
-describe SlackService::PushMessage do
+describe SlackService::PushMessage, models: true do
   subject { SlackService::PushMessage.new(args) }
 
   let(:args) do

spec/models/project_services/slack_service_spec.rb

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe SlackService do
+describe SlackService, models: true do
   describe "Associations" do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }

spec/models/project_snippet_spec.rb

@@ -17,7 +17,7 @@
 
 require 'spec_helper'
 
-describe ProjectSnippet do
+describe ProjectSnippet, models: true do
   describe "Associations" do
     it { is_expected.to belong_to(:project) }
   end

spec/models/project_spec.rb

@@ -33,7 +33,7 @@
 
 require 'spec_helper'
 
-describe Project do
+describe Project, models: true do
   describe 'associations' do
     it { is_expected.to belong_to(:group) }
     it { is_expected.to belong_to(:namespace) }

spec/models/project_team_spec.rb

 require "spec_helper"
 
-describe ProjectTeam do
+describe ProjectTeam, models: true do
   let(:master) { create(:user) }
   let(:reporter) { create(:user) }
   let(:guest) { create(:user) }

spec/models/project_wiki_spec.rb

 require "spec_helper"
 
-describe ProjectWiki do
+describe ProjectWiki, models: true do
   let(:project) { create(:empty_project) }
   let(:repository) { project.repository }
   let(:user) { project.owner }

spec/models/protected_branch_spec.rb

@@ -12,7 +12,7 @@
 
 require 'spec_helper'
 
-describe ProtectedBranch do
+describe ProtectedBranch, models: true do
   describe 'Associations' do
     it { is_expected.to belong_to(:project) }
   end

spec/models/repository_spec.rb

 require 'spec_helper'
 
-describe Repository do
+describe Repository, models: true do
   include RepoHelpers
 
   let(:repository) { create(:project).repository }

spec/models/service_spec.rb

@@ -20,7 +20,7 @@
 
 require 'spec_helper'
 
-describe Service do
+describe Service, models: true do
 
   describe "Associations" do
     it { is_expected.to belong_to :project }

spec/models/snippet_spec.rb

@@ -17,7 +17,7 @@
 
 require 'spec_helper'
 
-describe Snippet do
+describe Snippet, models: true do
   describe 'modules' do
     subject { described_class }
 

spec/models/user_spec.rb

@@ -61,7 +61,7 @@
 
 require 'spec_helper'
 
-describe User do
+describe User, models: true do
   include Gitlab::CurrentSettings
 
   describe 'modules' do

spec/models/wiki_page_spec.rb

 require "spec_helper"
 
-describe WikiPage do
+describe WikiPage, models: true do
   let(:project) { create(:empty_project) }
   let(:user) { project.owner }
   let(:wiki) { ProjectWiki.new(project, user) }

spec/services/archive_repository_service_spec.rb

 require 'spec_helper'
 
-describe ArchiveRepositoryService do
+describe ArchiveRepositoryService, services: true do
   let(:project) { create(:project) }
   subject { ArchiveRepositoryService.new(project, "master", "zip") }
 

spec/services/ci/create_commit_service_spec.rb

 require 'spec_helper'
 
 module Ci
-  describe CreateCommitService do
+  describe CreateCommitService, services: true do
     let(:service) { CreateCommitService.new }
     let(:project) { FactoryGirl.create(:ci_project) }
     let(:user) { nil }

spec/services/ci/create_trigger_request_service_spec.rb

 require 'spec_helper'
 
-describe Ci::CreateTriggerRequestService do
+describe Ci::CreateTriggerRequestService, services: true do
   let(:service) { Ci::CreateTriggerRequestService.new }
   let(:gl_project) { create(:project) }
   let(:project) { gl_project.ensure_gitlab_ci_project }

spec/services/ci/event_service_spec.rb

 require 'spec_helper'
 
-describe Ci::EventService do
+describe Ci::EventService, services: true do
   let(:project) { FactoryGirl.create :ci_project }
   let(:user)   { double(username: "root", id: 1) }
 

spec/services/ci/image_for_build_service_spec.rb

 require 'spec_helper'
 
 module Ci
-  describe ImageForBuildService do
+  describe ImageForBuildService, services: true do
     let(:service) { ImageForBuildService.new }
     let(:project) { FactoryGirl.create(:ci_project) }
     let(:gl_project) { FactoryGirl.create(:project, gitlab_ci_project: project) }

spec/services/ci/register_build_service_spec.rb

 require 'spec_helper'
 
 module Ci
-  describe RegisterBuildService do
+  describe RegisterBuildService, services: true do
     let!(:service) { RegisterBuildService.new }
     let!(:gl_project) { FactoryGirl.create :empty_project }
     let!(:commit) { FactoryGirl.create :ci_commit, gl_project: gl_project }

spec/services/ci/web_hook_service_spec.rb

 require 'spec_helper'
 
-describe Ci::WebHookService do
+describe Ci::WebHookService, services: true do
   let(:project) { FactoryGirl.create :ci_project }
   let(:gl_project) { FactoryGirl.create :empty_project, gitlab_ci_project: project }
   let(:commit)  { FactoryGirl.create :ci_commit, gl_project: gl_project }

spec/services/create_release_service_spec.rb

 require 'spec_helper'
 
-describe CreateReleaseService do
+describe CreateReleaseService, services: true do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:tag_name) { project.repository.tag_names.first }

spec/services/create_snippet_service_spec.rb

 require 'spec_helper'
 
-describe CreateSnippetService do
+describe CreateSnippetService, services: true do
   before do
     @user = create :user
     @admin = create :user, admin: true

spec/services/destroy_group_service_spec.rb

 require 'spec_helper'
 
-describe DestroyGroupService do
+describe DestroyGroupService, services: true do
   let!(:user) { create(:user) }
   let!(:group) { create(:group) }
   let!(:project) { create(:project, namespace: group) }

spec/services/event_create_service_spec.rb

 require 'spec_helper'
 
-describe EventCreateService do
+describe EventCreateService, services: true do
   let(:service) { EventCreateService.new }
 
   describe 'Issues' do

spec/services/git_hooks_service_spec.rb

 require 'spec_helper'
 
-describe GitHooksService do
+describe GitHooksService, services: true do
   include RepoHelpers
 
   let(:user)    { create :user }

spec/services/git_push_service_spec.rb

 require 'spec_helper'
 
-describe GitPushService do
+describe GitPushService, services: true do
   include RepoHelpers
 
   let(:user)          { create :user }

spec/services/git_tag_push_service_spec.rb

 require 'spec_helper'
 
-describe GitTagPushService do
+describe GitTagPushService, services: true do
   include RepoHelpers
 
   let(:user) { create :user }

spec/services/issues/bulk_update_service_spec.rb

 require 'spec_helper'
 
-describe Issues::BulkUpdateService do
+describe Issues::BulkUpdateService, services: true do
   let(:issue) { create(:issue, project: @project) }
 
   before do

spec/services/issues/close_service_spec.rb

 require 'spec_helper'
 
-describe Issues::CloseService do
+describe Issues::CloseService, services: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:issue) { create(:issue, assignee: user2) }

spec/services/issues/create_service_spec.rb

 require 'spec_helper'
 
-describe Issues::CreateService do
+describe Issues::CreateService, services: true do
   let(:project) { create(:empty_project) }
   let(:user) { create(:user) }
 

spec/services/issues/update_service_spec.rb

 require 'spec_helper'
 
-describe Issues::UpdateService do
+describe Issues::UpdateService, services: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:user3) { create(:user) }

spec/services/merge_requests/close_service_spec.rb

 require 'spec_helper'
 
-describe MergeRequests::CloseService do
+describe MergeRequests::CloseService, services: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:merge_request) { create(:merge_request, assignee: user2) }

spec/services/merge_requests/create_service_spec.rb

 require 'spec_helper'
 
-describe MergeRequests::CreateService do
+describe MergeRequests::CreateService, services: true do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
 

spec/services/merge_requests/merge_service_spec.rb

 require 'spec_helper'
 
-describe MergeRequests::MergeService do
+describe MergeRequests::MergeService, services: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:merge_request) { create(:merge_request, assignee: user2) }

spec/services/merge_requests/refresh_service_spec.rb

 require 'spec_helper'
 
-describe MergeRequests::RefreshService do
+describe MergeRequests::RefreshService, services: true do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:service) { MergeRequests::RefreshService }

spec/services/merge_requests/reopen_service_spec.rb

 require 'spec_helper'
 
-describe MergeRequests::ReopenService do
+describe MergeRequests::ReopenService, services: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:merge_request) { create(:merge_request, assignee: user2) }

spec/services/merge_requests/update_service_spec.rb

 require 'spec_helper'
 
-describe MergeRequests::UpdateService do
+describe MergeRequests::UpdateService, services: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:user3) { create(:user) }

spec/services/milestones/close_service_spec.rb

 require 'spec_helper'
 
-describe Milestones::CloseService do
+describe Milestones::CloseService, services: true do
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:milestone) { create(:milestone, title: "Milestone v1.2", project: project) }

spec/services/milestones/create_service_spec.rb

 require 'spec_helper'
 
-describe Milestones::CreateService do
+describe Milestones::CreateService, services: true do
   let(:project) { create(:empty_project) }
   let(:user) { create(:user) }
 

spec/services/notes/create_service_spec.rb

 require 'spec_helper'
 
-describe Notes::CreateService do
+describe Notes::CreateService, services: true do
   let(:project) { create(:empty_project) }
   let(:issue) { create(:issue, project: project) }
   let(:user) { create(:user) }

spec/services/notification_service_spec.rb

 require 'spec_helper'
 
-describe NotificationService do
+describe NotificationService, services: true do
   let(:notification) { NotificationService.new }
 
   around(:each) do |example|

spec/services/projects/create_service_spec.rb

 require 'spec_helper'
 
-describe Projects::CreateService do
+describe Projects::CreateService, services: true do
   describe :create_by_user do
     before do
       @user = create :user

spec/services/projects/destroy_service_spec.rb

 require 'spec_helper'
 
-describe Projects::DestroyService do
+describe Projects::DestroyService, services: true do
   let!(:user) { create(:user) }
   let!(:project) { create(:project, namespace: user.namespace) }
   let!(:path) { project.repository.path_to_repo }

spec/services/projects/download_service_spec.rb

 require 'spec_helper'
 
-describe Projects::DownloadService do
+describe Projects::DownloadService, services: true do
   describe 'File service' do
     before do
       @user = create :user

spec/services/projects/fork_service_spec.rb

 require 'spec_helper'
 
-describe Projects::ForkService do
+describe Projects::ForkService, services: true do
   describe :fork_by_user do
     before do
       @from_namespace = create(:namespace)

spec/services/projects/transfer_service_spec.rb

 require 'spec_helper'
 
-describe Projects::TransferService do
+describe Projects::TransferService, services: true do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, namespace: user.namespace) }

spec/services/projects/update_service_spec.rb

 require 'spec_helper'
 
-describe Projects::UpdateService do
+describe Projects::UpdateService, services: true do
   describe :update_by_user do
     before do
       @user = create :user

spec/services/projects/upload_service_spec.rb

 require 'spec_helper'
 
-describe Projects::UploadService do
+describe Projects::UploadService, services: true do
   describe 'File service' do
     before do
       @user = create :user

spec/services/search_service_spec.rb

 require 'spec_helper'
 
-describe 'Search::GlobalService' do
+describe 'Search::GlobalService', services: true do
   let(:user) { create(:user) }
   let(:public_user) { create(:user) }
   let(:internal_user) { create(:user) }

spec/services/system_hooks_service_spec.rb

 require 'spec_helper'
 
-describe SystemHooksService do
+describe SystemHooksService, services: true do
   let(:user)          { create :user }
   let(:project)       { create :project }
   let(:project_member) { create :project_member }

spec/services/system_note_service_spec.rb

 require 'spec_helper'
 
-describe SystemNoteService do
+describe SystemNoteService, services: true do
   let(:project)  { create(:project) }
   let(:author)   { create(:user) }
   let(:noteable) { create(:issue, project: project) }

spec/services/test_hook_service_spec.rb

 require 'spec_helper'
 
-describe TestHookService do
+describe TestHookService, services: true do
   let(:user)    { create :user }
   let(:project) { create :project }
   let(:hook)    { create :project_hook, project: project }

spec/services/update_release_service_spec.rb

 require 'spec_helper'
 
-describe UpdateReleaseService do
+describe UpdateReleaseService, services: true do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:tag_name) { project.repository.tag_names.first }

spec/services/update_snippet_service_spec.rb

 require 'spec_helper'
 
-describe UpdateSnippetService do
+describe UpdateSnippetService, services: true do
   before do
     @user = create :user
     @admin = create :user, admin: true