Add latest changes from gitlab-org/gitlab@master

3 files changed, 2 insertions, 84 deletions

diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index 63797e22b38..2f597fd5cb3 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -394,8 +394,7 @@ describe SessionsController do
               end
 
               it 'warns about invalid login' do
-                expect(response).to set_flash.now[:alert]
-                  .to /Invalid Login or password/
+                expect(response).to set_flash.now[:alert].to /Your account is locked./
               end
 
               it 'locks the user' do
@@ -405,8 +404,7 @@ describe SessionsController do
               it 'keeps the user locked on future login attempts' do
                 post(:create, params: { user: { login: user.username, password: user.password } })
 
-                expect(response)
-                  .to set_flash.now[:alert].to /Invalid Login or password/
+                expect(response).to set_flash.now[:alert].to /Your account is locked./
               end
             end
           end
diff --git a/spec/lib/gitlab/diff/deprecated_highlight_cache_spec.rb b/spec/lib/gitlab/diff/deprecated_highlight_cache_spec.rb
deleted file mode 100644
index 7e46632ea77..00000000000
--- a/spec/lib/gitlab/diff/deprecated_highlight_cache_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Gitlab::Diff::DeprecatedHighlightCache do
-  let(:merge_request) { create(:merge_request_with_diffs) }
-
-  subject(:cache) { described_class.new(merge_request.diffs, backend: backend) }
-
-  describe '#decorate' do
-    let(:backend) { double('backend').as_null_object }
-
-    # Manually creates a Diff::File object to avoid triggering the cache on
-    # the FileCollection::MergeRequestDiff
-    let(:diff_file) do
-      diffs = merge_request.diffs
-      raw_diff = diffs.diffable.raw_diffs(diffs.diff_options.merge(paths: ['CHANGELOG'])).first
-      Gitlab::Diff::File.new(raw_diff,
-                             repository: diffs.project.repository,
-                             diff_refs: diffs.diff_refs,
-                             fallback_diff_refs: diffs.fallback_diff_refs)
-    end
-
-    it 'does not calculate highlighting when reading from cache' do
-      cache.write_if_empty
-      cache.decorate(diff_file)
-
-      expect_any_instance_of(Gitlab::Diff::Highlight).not_to receive(:highlight)
-
-      diff_file.highlighted_diff_lines
-    end
-
-    it 'assigns highlighted diff lines to the DiffFile' do
-      cache.write_if_empty
-      cache.decorate(diff_file)
-
-      expect(diff_file.highlighted_diff_lines.size).to be > 5
-    end
-
-    it 'submits a single reading from the cache' do
-      cache.decorate(diff_file)
-      cache.decorate(diff_file)
-
-      expect(backend).to have_received(:read).with(cache.key).once
-    end
-  end
-
-  describe '#write_if_empty' do
-    let(:backend) { double('backend', read: {}).as_null_object }
-
-    it 'submits a single writing to the cache' do
-      cache.write_if_empty
-      cache.write_if_empty
-
-      expect(backend).to have_received(:write).with(cache.key,
-                                                    hash_including('CHANGELOG-false-false-false'),
-                                                    expires_in: 1.week).once
-    end
-  end
-
-  describe '#clear' do
-    let(:backend) { double('backend').as_null_object }
-
-    it 'clears cache' do
-      cache.clear
-
-      expect(backend).to have_received(:delete).with(cache.key)
-    end
-  end
-end
diff --git a/spec/lib/gitlab/diff/highlight_cache_spec.rb b/spec/lib/gitlab/diff/highlight_cache_spec.rb
index c73ec84e332..bff51709c40 100644
--- a/spec/lib/gitlab/diff/highlight_cache_spec.rb
+++ b/spec/lib/gitlab/diff/highlight_cache_spec.rb
@@ -135,16 +135,6 @@ describe Gitlab::Diff::HighlightCache, :clean_gitlab_redis_cache do
       expect { cache.send(:write_to_redis_hash, diff_hash) }
         .to change { Gitlab::Redis::Cache.with { |r| r.hgetall(cache_key) } }
     end
-
-    # Note that this spec and the code it confirms can be removed when
-    #   :hset_redis_diff_caching is fully launched.
-    #
-    it 'attempts to clear deprecated cache entries' do
-      expect_any_instance_of(Gitlab::Diff::DeprecatedHighlightCache)
-        .to receive(:clear).and_call_original
-
-      cache.send(:write_to_redis_hash, diff_hash)
-    end
   end
 
   describe '#clear' do