Commit a90478c6 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Fix test failures

parent 5c831e47
...@@ -5,7 +5,5 @@ class RolloutStatusEntity < Grape::Entity ...@@ -5,7 +5,5 @@ class RolloutStatusEntity < Grape::Entity
expose :instances, if: -> (rollout_status, _) { rollout_status.found? } expose :instances, if: -> (rollout_status, _) { rollout_status.found? }
expose :completion, if: -> (rollout_status, _) { rollout_status.found? } expose :completion, if: -> (rollout_status, _) { rollout_status.found? }
expose :is_completed, if: -> (rollout_status, _) { rollout_status.found? } do |rollout_status| expose :complete?, as: :is_completed, if: -> (rollout_status, _) { rollout_status.found? }
rollout_status.complete?
end
end end
...@@ -20,8 +20,8 @@ module EE ...@@ -20,8 +20,8 @@ module EE
super super
Gitlab::EtagCaching::Store.new.tap do |store| Gitlab::EtagCaching::Store.new.tap do |store|
store.touch(Gitlab::Routing.url_helpers.project_environments_path( store.touch(
project, format: :json)) Gitlab::Routing.url_helpers.project_environments_path(project, format: :json))
end end
end end
......
...@@ -12,10 +12,6 @@ module Gitlab ...@@ -12,10 +12,6 @@ module Gitlab
completion == 100 completion == 100
end end
def status
@status
end
def loading? def loading?
@status == :loading @status == :loading
end end
......
...@@ -118,8 +118,8 @@ describe Gitlab::Kubernetes::RolloutStatus do ...@@ -118,8 +118,8 @@ describe Gitlab::Kubernetes::RolloutStatus do
end end
end end
describe '.loading_rollout' do describe '.loading' do
subject { described_class.loading_rollout } subject { described_class.loading }
it { is_expected.to be_loading } it { is_expected.to be_loading }
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment