Skip to content
代码片段 群组 项目
未验证 提交 61e53ade 编辑于 作者: Sarah Yasonik's avatar Sarah Yasonik 提交者: GitLab
浏览文件

Fix quarantined internal event matcher spec

上级 a3ddf7af
No related branches found
No related tags found
无相关合并请求
...@@ -53,22 +53,21 @@ def track_event(event: nil, user: nil, group: nil) ...@@ -53,22 +53,21 @@ def track_event(event: nil, user: nil, group: nil)
it 'bubbles up failure messages' do it 'bubbles up failure messages' do
expect do expect do
expect { nil }.to trigger_internal_events('g_edit_by_sfe') expect { nil }.to trigger_internal_events('g_edit_by_sfe')
end.to raise_error RSpec::Expectations::ExpectationNotMetError, end.to raise_expectation_error_with <<~TEXT
"(Gitlab::InternalEvents).track_event(\"g_edit_by_sfe\", *(any args))\n " \ (Gitlab::InternalEvents).track_event("g_edit_by_sfe", *(any args))
"expected: 1 time with arguments: (\"g_edit_by_sfe\", *(any args))\n " \ expected: 1 time with arguments: ("g_edit_by_sfe", *(any args))
"received: 0 times" received: 0 times
TEXT
end end
it 'bubbles up failure messages for negated matcher', it 'bubbles up failure messages for negated matcher' do
quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/463147' do
expect do expect do
expect { track_event }.not_to trigger_internal_events('g_edit_by_sfe') expect { track_event }.not_to trigger_internal_events('g_edit_by_sfe')
end.to raise_error RSpec::Expectations::ExpectationNotMetError, end.to raise_expectation_error_with <<~TEXT
"(Gitlab::InternalEvents).track_event(\"g_edit_by_sfe\", " \ (Gitlab::InternalEvents).track_event("g_edit_by_sfe", {:namespace=>#<Group id:#{group_1.id} @#{group_1.name}>, :user=>#<User id:#{user_1.id} @#{user_1.username}>})
"{:namespace=>#<Group id:#{group_1.id} @group1>, :user=>#<User id:#{user_1.id} @user1>})\n " \ expected: 0 times with arguments: ("g_edit_by_sfe", anything)
"expected: 0 times with arguments: (\"g_edit_by_sfe\", anything)\n " \ received: 1 time with arguments: ("g_edit_by_sfe", {:namespace=>#<Group id:#{group_1.id} @#{group_1.name}>, :user=>#<User id:#{user_1.id} @#{user_1.username}>})
"received: 1 time with arguments: (\"g_edit_by_sfe\", " \ TEXT
"{:namespace=>#<Group id:#{group_1.id} @group1>, :user=>#<User id:#{user_1.id} @user1>})"
end end
it 'handles events that should not be triggered' do it 'handles events that should not be triggered' do
...@@ -176,9 +175,10 @@ def track_event(event: nil, user: nil, group: nil) ...@@ -176,9 +175,10 @@ def track_event(event: nil, user: nil, group: nil)
end end
it 'returns a meaningful failure message for :increment_usage_metrics' do it 'returns a meaningful failure message for :increment_usage_metrics' do
expect { assertion }.to raise_error RSpec::Expectations::ExpectationNotMetError, expect { assertion }.to raise_expectation_error_with <<~TEXT
"expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_weekly to be incremented by 1\n " \ expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_weekly to be incremented by 1
"-> value went from 0 to 0" -> value went from 0 to 0
TEXT
end end
end end
...@@ -191,11 +191,12 @@ def track_event(event: nil, user: nil, group: nil) ...@@ -191,11 +191,12 @@ def track_event(event: nil, user: nil, group: nil)
end end
it 'returns a meaningful failure message for :increment_usage_metrics' do it 'returns a meaningful failure message for :increment_usage_metrics' do
expect { assertion }.to raise_error RSpec::Expectations::ExpectationNotMetError, expect { assertion }.to raise_expectation_error_with <<~TEXT
"expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_weekly to be incremented by 1\n " \ expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_weekly to be incremented by 1
"-> value went from 0 to 0\n" \ -> value went from 0 to 0
"expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_monthly to be incremented by 1\n " \ expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_monthly to be incremented by 1
"-> value went from 0 to 0" -> value went from 0 to 0
TEXT
end end
end end
...@@ -207,12 +208,15 @@ def track_event(event: nil, user: nil, group: nil) ...@@ -207,12 +208,15 @@ def track_event(event: nil, user: nil, group: nil)
end end
it 'returns a meaningful failure message for :increment_usage_metrics' do it 'returns a meaningful failure message for :increment_usage_metrics' do
expect { assertion }.to raise_error RSpec::Expectations::ExpectationNotMetError, expect { assertion }.to raise_expectation_error_with <<~TEXT
" expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_weekly " \ expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_weekly to be incremented by 1
"to be incremented by 1\n -> value went from 0 to 0\n\n" \ -> value went from 0 to 0
"...and:\n\n " \
"expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_monthly " \ ...and:
"to be incremented by 1\n -> value went from 0 to 0"
expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_monthly to be incremented by 1
-> value went from 0 to 0
TEXT
end end
end end
end end
...@@ -225,9 +229,10 @@ def track_event(event: nil, user: nil, group: nil) ...@@ -225,9 +229,10 @@ def track_event(event: nil, user: nil, group: nil)
end end
it 'returns a meaningful failure message for :increment_usage_metrics' do it 'returns a meaningful failure message for :increment_usage_metrics' do
expect { assertion }.to raise_error RSpec::Expectations::ExpectationNotMetError, expect { assertion }.to raise_expectation_error_with <<~TEXT
"expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_weekly not to be incremented\n " \ expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_weekly not to be incremented
"-> value went from 0 to 1" -> value went from 0 to 1
TEXT
end end
end end
...@@ -240,11 +245,12 @@ def track_event(event: nil, user: nil, group: nil) ...@@ -240,11 +245,12 @@ def track_event(event: nil, user: nil, group: nil)
end end
it 'returns a meaningful failure message for :increment_usage_metrics' do it 'returns a meaningful failure message for :increment_usage_metrics' do
expect { assertion }.to raise_error RSpec::Expectations::ExpectationNotMetError, expect { assertion }.to raise_expectation_error_with <<~TEXT
"expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_weekly not to be incremented\n " \ expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_weekly not to be incremented
"-> value went from 0 to 1\n" \ -> value went from 0 to 1
"expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_monthly not to be incremented\n " \ expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_monthly not to be incremented
"-> value went from 0 to 1" -> value went from 0 to 1
TEXT
end end
end end
...@@ -256,12 +262,15 @@ def track_event(event: nil, user: nil, group: nil) ...@@ -256,12 +262,15 @@ def track_event(event: nil, user: nil, group: nil)
end end
it 'returns a meaningful failure message for :increment_usage_metrics' do it 'returns a meaningful failure message for :increment_usage_metrics' do
expect { assertion }.to raise_error RSpec::Expectations::ExpectationNotMetError, expect { assertion }.to raise_expectation_error_with <<~TEXT
" expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_weekly " \ expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_weekly not to be incremented
"not to be incremented\n -> value went from 0 to 1\n\n" \ -> value went from 0 to 1
"...and:\n\n " \
"expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_monthly " \ ...and:
"not to be incremented\n -> value went from 0 to 1"
expected metric redis_hll_counters.ide_edit.g_edit_by_sfe_monthly not to be incremented
-> value went from 0 to 1
TEXT
end end
end end
end end
...@@ -389,4 +398,14 @@ def track_event(event: nil, user: nil, group: nil) ...@@ -389,4 +398,14 @@ def track_event(event: nil, user: nil, group: nil)
end end
end end
end end
private
def raise_expectation_error_with(error_message)
error_matcher = an_object_satisfying do |actual_message|
expect(actual_message).to eq error_message.chomp
end
raise_error RSpec::Expectations::ExpectationNotMetError, error_matcher
end
end end
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册