Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 19 insertions, 0 deletions

diff --git a/spec/serializers/rollout_statuses/ingress_entity_spec.rb b/spec/serializers/rollout_statuses/ingress_entity_spec.rb
new file mode 100644
index 00000000000..b87b9e5c6c4
--- /dev/null
+++ b/spec/serializers/rollout_statuses/ingress_entity_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe RolloutStatuses::IngressEntity do
+  include KubernetesHelpers
+
+  let(:canary_ingress) { kube_ingress(track: :canary) }
+
+  let(:entity) do
+    described_class.new(canary_ingress, request: double)
+  end
+
+  subject { entity.as_json }
+
+  it 'exposes canary weight' do
+    is_expected.to include(:canary_weight)
+  end
+end