Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 6 deletions

diff --git a/spec/lib/atlassian/jira_connect/client_spec.rb b/spec/lib/atlassian/jira_connect/client_spec.rb
index 7c05912a49d..9759bceb58e 100644
--- a/spec/lib/atlassian/jira_connect/client_spec.rb
+++ b/spec/lib/atlassian/jira_connect/client_spec.rb
@@ -114,7 +114,7 @@ RSpec.describe Atlassian::JiraConnect::Client do
     end
 
     let(:body) do
-      matcher = be_valid_json.according_to_schema(schema)
+      matcher = be_valid_json.and match_schema(schema)
 
       ->(text) { matcher.matches?(text) }
     end
@@ -164,7 +164,7 @@ RSpec.describe Atlassian::JiraConnect::Client do
     end
 
     let(:body) do
-      matcher = be_valid_json.according_to_schema(build_info_payload_schema)
+      matcher = be_valid_json.and match_schema(build_info_payload_schema)
 
       ->(text) { matcher.matches?(text) }
     end
diff --git a/spec/lib/atlassian/jira_connect/serializers/build_entity_spec.rb b/spec/lib/atlassian/jira_connect/serializers/build_entity_spec.rb
index 52e475d20ca..4bbd654655d 100644
--- a/spec/lib/atlassian/jira_connect/serializers/build_entity_spec.rb
+++ b/spec/lib/atlassian/jira_connect/serializers/build_entity_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Atlassian::JiraConnect::Serializers::BuildEntity do
       end
 
       it 'is invalid, since it has no issue keys' do
-        expect(subject.to_json).not_to be_valid_json.according_to_schema(Atlassian::Schemata.build_info)
+        expect(subject.to_json).not_to match_schema(Atlassian::Schemata.build_info)
       end
     end
   end
@@ -43,7 +43,7 @@ RSpec.describe Atlassian::JiraConnect::Serializers::BuildEntity do
 
         describe '#to_json' do
           it 'is valid according to the build info schema' do
-            expect(subject.to_json).to be_valid_json.according_to_schema(Atlassian::Schemata.build_info)
+            expect(subject.to_json).to be_valid_json.and match_schema(Atlassian::Schemata.build_info)
           end
         end
       end
diff --git a/spec/lib/atlassian/jira_connect/serializers/deployment_entity_spec.rb b/spec/lib/atlassian/jira_connect/serializers/deployment_entity_spec.rb
index 42a10944dc9..82bcbdc4561 100644
--- a/spec/lib/atlassian/jira_connect/serializers/deployment_entity_spec.rb
+++ b/spec/lib/atlassian/jira_connect/serializers/deployment_entity_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Atlassian::JiraConnect::Serializers::DeploymentEntity do
       end
 
       it 'is invalid, since it has no issue keys' do
-        expect(subject.to_json).not_to be_valid_json.according_to_schema(Atlassian::Schemata.deployment_info)
+        expect(subject.to_json).not_to match_schema(Atlassian::Schemata.deployment_info)
       end
     end
   end
@@ -86,7 +86,7 @@ RSpec.describe Atlassian::JiraConnect::Serializers::DeploymentEntity do
 
         describe '#to_json' do
           it 'is valid according to the deployment info schema' do
-            expect(subject.to_json).to be_valid_json.according_to_schema(Atlassian::Schemata.deployment_info)
+            expect(subject.to_json).to be_valid_json.and match_schema(Atlassian::Schemata.deployment_info)
           end
         end
       end