Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 11 deletions

diff --git a/spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb b/spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb
index 3605bac7dfc..10843a1435a 100644
--- a/spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb
+++ b/spec/lib/gitlab/ci/build/rules/rule/clause/exists_spec.rb
@@ -18,7 +18,7 @@ describe Gitlab::Ci::Build::Rules::Rule::Clause::Exists do
 
       before do
         stub_const('Gitlab::Ci::Build::Rules::Rule::Clause::Exists::MAX_PATTERN_COMPARISONS', 2)
-        expect(File).to receive(:fnmatch?).exactly(2).times.and_call_original
+        expect(File).to receive(:fnmatch?).twice.and_call_original
       end
 
       it { is_expected.to be_truthy }
diff --git a/spec/lib/gitlab/ci/trace/chunked_io_spec.rb b/spec/lib/gitlab/ci/trace/chunked_io_spec.rb
index 795e8e51276..1b034656e7d 100644
--- a/spec/lib/gitlab/ci/trace/chunked_io_spec.rb
+++ b/spec/lib/gitlab/ci/trace/chunked_io_spec.rb
@@ -12,7 +12,7 @@ describe Gitlab::Ci::Trace::ChunkedIO, :clean_gitlab_redis_cache do
     stub_feature_flags(ci_enable_live_trace: true)
   end
 
-  context "#initialize" do
+  describe "#initialize" do
     context 'when a chunk exists' do
       before do
         build.trace.set('ABC')
@@ -35,7 +35,7 @@ describe Gitlab::Ci::Trace::ChunkedIO, :clean_gitlab_redis_cache do
     end
   end
 
-  context "#seek" do
+  describe "#seek" do
     subject { chunked_io.seek(pos, where) }
 
     before do
@@ -66,7 +66,7 @@ describe Gitlab::Ci::Trace::ChunkedIO, :clean_gitlab_redis_cache do
     end
   end
 
-  context "#eof?" do
+  describe "#eof?" do
     subject { chunked_io.eof? }
 
     before do
@@ -90,7 +90,7 @@ describe Gitlab::Ci::Trace::ChunkedIO, :clean_gitlab_redis_cache do
     end
   end
 
-  context "#each_line" do
+  describe "#each_line" do
     let(:string_io) { StringIO.new(sample_trace_raw) }
 
     context 'when buffer size is smaller than file size' do
@@ -134,7 +134,7 @@ describe Gitlab::Ci::Trace::ChunkedIO, :clean_gitlab_redis_cache do
     end
   end
 
-  context "#read" do
+  describe "#read" do
     subject { chunked_io.read(length) }
 
     context 'when read the whole size' do
@@ -254,7 +254,7 @@ describe Gitlab::Ci::Trace::ChunkedIO, :clean_gitlab_redis_cache do
     end
   end
 
-  context "#readline" do
+  describe "#readline" do
     subject { chunked_io.readline }
 
     let(:string_io) { StringIO.new(sample_trace_raw) }
@@ -334,7 +334,7 @@ describe Gitlab::Ci::Trace::ChunkedIO, :clean_gitlab_redis_cache do
     end
   end
 
-  context "#write" do
+  describe "#write" do
     subject { chunked_io.write(data) }
 
     let(:data) { sample_trace_raw }
@@ -399,7 +399,7 @@ describe Gitlab::Ci::Trace::ChunkedIO, :clean_gitlab_redis_cache do
     end
   end
 
-  context "#truncate" do
+  describe "#truncate" do
     let(:offset) { 10 }
 
     context 'when data does not exist' do
@@ -432,7 +432,7 @@ describe Gitlab::Ci::Trace::ChunkedIO, :clean_gitlab_redis_cache do
     end
   end
 
-  context "#destroy!" do
+  describe "#destroy!" do
     subject { chunked_io.destroy! }
 
     before do
diff --git a/spec/lib/gitlab/ci/trace/section_parser_spec.rb b/spec/lib/gitlab/ci/trace/section_parser_spec.rb
index 6e8504a1584..24ce4d34411 100644
--- a/spec/lib/gitlab/ci/trace/section_parser_spec.rb
+++ b/spec/lib/gitlab/ci/trace/section_parser_spec.rb
@@ -74,7 +74,7 @@ describe Gitlab::Ci::Trace::SectionParser do
       let(:lines) { build_lines(trace) }
 
       it 'must handle correctly byte positioning' do
-        expect(subject).to receive(:find_next_marker).exactly(2).times.and_call_original
+        expect(subject).to receive(:find_next_marker).twice.and_call_original
 
         subject.parse!