Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/tooling/lib/tooling/test_file_finder_spec.rb b/spec/tooling/lib/tooling/test_file_finder_spec.rb
index a56600709c6..9c33f20877b 100644
--- a/spec/tooling/lib/tooling/test_file_finder_spec.rb
+++ b/spec/tooling/lib/tooling/test_file_finder_spec.rb
@@ -31,10 +31,10 @@ RSpec.describe Tooling::TestFileFinder do
     end
 
     context 'when given a file in tooling/' do
-      let(:file) { 'tooling/lib/quality/test_file_finder.rb' }
+      let(:file) { 'tooling/lib/tooling/test_file_finder.rb' }
 
       it 'returns the matching tooling test' do
-        expect(subject.test_files).to contain_exactly('spec/tooling/lib/quality/test_file_finder_spec.rb')
+        expect(subject.test_files).to contain_exactly('spec/tooling/lib/tooling/test_file_finder_spec.rb')
       end
     end
 
@@ -54,11 +54,11 @@ RSpec.describe Tooling::TestFileFinder do
       end
     end
 
-    context 'when given a module file in ee/' do
+    context 'when given an ee extension module file' do
       let(:file) { 'ee/app/models/ee/user.rb' }
 
-      it 'returns the matching ee/ module test file and the ee/ model test file' do
-        test_files = ['ee/spec/models/ee/user_spec.rb', 'spec/app/models/user_spec.rb']
+      it 'returns the matching ee/ class test file, ee extension module test file and the foss class test file' do
+        test_files = ['ee/spec/models/user_spec.rb', 'ee/spec/models/ee/user_spec.rb', 'spec/app/models/user_spec.rb']
         expect(subject.test_files).to contain_exactly(*test_files)
       end
     end