Merge branch 'mc-removes-fixtures-from-db-files' into 'master'

Removes db/fixtures from database files

See merge request gitlab-org/gitlab-ce!31635

2 files changed, 13 insertions, 5 deletions

diff --git a/lib/gitlab/danger/helper.rb b/lib/gitlab/danger/helper.rb
index c0a12318990..332ca8bf9b8 100644
--- a/lib/gitlab/danger/helper.rb
+++ b/lib/gitlab/danger/helper.rb
@@ -113,7 +113,7 @@ module Gitlab
           yarn\.lock
         )\z}x => :frontend,
 
-        %r{\A(ee/)?db/} => :database,
+        %r{\A(ee/)?db/(?!fixtures)[^/]+} => :database,
         %r{\A(ee/)?lib/gitlab/(database|background_migration|sql|github_import)(/|\.rb)} => :database,
         %r{\A(app/models/project_authorization|app/services/users/refresh_authorized_projects_service)(/|\.rb)} => :database,
         %r{\Arubocop/cop/migration(/|\.rb)} => :database,
diff --git a/spec/lib/gitlab/danger/helper_spec.rb b/spec/lib/gitlab/danger/helper_spec.rb
index f11f68ab3c2..2990594c538 100644
--- a/spec/lib/gitlab/danger/helper_spec.rb
+++ b/spec/lib/gitlab/danger/helper_spec.rb
@@ -101,13 +101,13 @@ describe Gitlab::Danger::Helper do
 
   describe '#changes_by_category' do
     it 'categorizes changed files' do
-      expect(fake_git).to receive(:added_files) { %w[foo foo.md foo.rb foo.js db/foo lib/gitlab/database/foo.rb qa/foo ee/changelogs/foo.yml] }
+      expect(fake_git).to receive(:added_files) { %w[foo foo.md foo.rb foo.js db/migrate/foo lib/gitlab/database/foo.rb qa/foo ee/changelogs/foo.yml] }
       allow(fake_git).to receive(:modified_files) { [] }
       allow(fake_git).to receive(:renamed_files) { [] }
 
       expect(helper.changes_by_category).to eq(
         backend: %w[foo.rb],
-        database: %w[db/foo lib/gitlab/database/foo.rb],
+        database: %w[db/migrate/foo lib/gitlab/database/foo.rb],
         frontend: %w[foo.js],
         none: %w[ee/changelogs/foo.yml foo.md],
         qa: %w[qa/foo],
@@ -173,8 +173,13 @@ describe Gitlab::Danger::Helper do
 
       'ee/FOO_VERSION' | :unknown
 
-      'db/foo'                                                    | :database
-      'ee/db/foo'                                                 | :database
+      'db/schema.rb'                                              | :database
+      'db/migrate/foo'                                            | :database
+      'db/post_migrate/foo'                                       | :database
+      'ee/db/migrate/foo'                                         | :database
+      'ee/db/post_migrate/foo'                                    | :database
+      'ee/db/geo/migrate/foo'                                     | :database
+      'ee/db/geo/post_migrate/foo'                                | :database
       'app/models/project_authorization.rb'                       | :database
       'app/services/users/refresh_authorized_projects_service.rb' | :database
       'lib/gitlab/background_migration.rb'                        | :database
@@ -188,6 +193,9 @@ describe Gitlab::Danger::Helper do
       'lib/gitlab/sql/foo'                                        | :database
       'rubocop/cop/migration/foo'                                 | :database
 
+      'db/fixtures/foo.rb'                                 | :backend
+      'ee/db/fixtures/foo.rb'                              | :backend
+
       'qa/foo' | :qa
       'ee/qa/foo' | :qa