Resolve "Precompiled assets with digest strings are ignored in CI"

2 files changed, 5 insertions, 4 deletions

diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb
index 2f989397f7e..1f1c48ee9b5 100644
--- a/spec/lib/gitlab/path_regex_spec.rb
+++ b/spec/lib/gitlab/path_regex_spec.rb
@@ -84,9 +84,9 @@ describe Gitlab::PathRegex do
   let(:top_level_words) do
     words = routes_not_starting_in_wildcard.map do |route|
       route.split('/')[1]
-    end.compact.uniq
+    end.compact
 
-    words + ee_top_level_words + files_in_public + Array(API::API.prefix.to_s)
+    (words + ee_top_level_words + files_in_public + Array(API::API.prefix.to_s)).uniq
   end
 
   let(:ee_top_level_words) do
@@ -95,10 +95,11 @@ describe Gitlab::PathRegex do
 
   let(:files_in_public) do
     git = Gitlab.config.git.bin_path
-    `cd #{Rails.root} && #{git} ls-files public`
+    tracked = `cd #{Rails.root} && #{git} ls-files public`
       .split("\n")
       .map { |entry| entry.gsub('public/', '') }
       .uniq
+    tracked + %w(assets uploads)
   end
 
   # All routes that start with a namespaced path, that have 1 or more
diff --git a/spec/lib/gitlab/popen_spec.rb b/spec/lib/gitlab/popen_spec.rb
index 4567f220c11..b145ca36f26 100644
--- a/spec/lib/gitlab/popen_spec.rb
+++ b/spec/lib/gitlab/popen_spec.rb
@@ -14,7 +14,7 @@ describe 'Gitlab::Popen' do
     end
 
     it { expect(@status).to be_zero }
-    it { expect(@output).to include('cache') }
+    it { expect(@output).to include('tests') }
   end
 
   context 'non-zero status' do