diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-15 22:56:15 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-15 22:56:15 +0300 |
| commit | b540b987648ae6e24bbbc01a7773b2e3209a47b0 (patch) | |
| tree | 904ace3d5524eef227976910e136f98925e62371 /spec/lib/gitlab | |
| parent | 95f5a525b5a729725d6b559101026b8f39c9c39d (diff) | |
| parent | 02994fbe7715ef4539f720b6d395eeb9a3d71f14 (diff) | |
Merge branch 'no-ivar-in-modules' into 'master'
Add cop to make sure we don't use ivar in a module
See merge request gitlab-org/gitlab-ce!12800
Diffstat (limited to 'spec/lib/gitlab')
| -rw-r--r-- | spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb b/spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb index 0560c47f03f..3fe0493ed9b 100644 --- a/spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb +++ b/spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb @@ -23,6 +23,8 @@ describe Gitlab::CycleAnalytics::BaseEventFetcher do allow_any_instance_of(described_class).to receive(:serialize) do |event| event end + allow_any_instance_of(described_class) + .to receive(:allowed_ids).and_return(nil) stub_const('Gitlab::CycleAnalytics::BaseEventFetcher::MAX_EVENTS', max_events) |