Commit a4b43b89 authored by Micaël Bergeron's avatar Micaël Bergeron

fix failing specs

parent 035b9f73
...@@ -311,6 +311,7 @@ production: &base ...@@ -311,6 +311,7 @@ production: &base
geo_migrated_local_files_clean_up_worker: geo_migrated_local_files_clean_up_worker:
cron: "15 */6 * * *" cron: "15 */6 * * *"
# Export pseudonymized data in CSV format for analysis
pseudonymizer_worker: pseudonymizer_worker:
cron: "0 * * * *" cron: "0 * * * *"
......
...@@ -370,9 +370,9 @@ Settings.cron_jobs['gitlab_usage_ping_worker'] ||= Settingslogic.new({}) ...@@ -370,9 +370,9 @@ Settings.cron_jobs['gitlab_usage_ping_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['gitlab_usage_ping_worker']['cron'] ||= Settings.__send__(:cron_for_usage_ping) Settings.cron_jobs['gitlab_usage_ping_worker']['cron'] ||= Settings.__send__(:cron_for_usage_ping)
Settings.cron_jobs['gitlab_usage_ping_worker']['job_class'] = 'GitlabUsagePingWorker' Settings.cron_jobs['gitlab_usage_ping_worker']['job_class'] = 'GitlabUsagePingWorker'
Settings.cron_jobs['pseudonymizer'] ||= Settingslogic.new({}) Settings.cron_jobs['pseudonymizer_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['pseudonymizer']['cron'] ||= '0 23 * * *' Settings.cron_jobs['pseudonymizer_worker']['cron'] ||= '0 23 * * *'
Settings.cron_jobs['pseudonymizer']['job_class'] ||= 'PseudonymizerWorker' Settings.cron_jobs['pseudonymizer_worker']['job_class'] ||= 'PseudonymizerWorker'
Settings.cron_jobs['schedule_update_user_activity_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['schedule_update_user_activity_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['schedule_update_user_activity_worker']['cron'] ||= '30 0 * * *' Settings.cron_jobs['schedule_update_user_activity_worker']['cron'] ||= '30 0 * * *'
......
...@@ -7,7 +7,7 @@ describe Pseudonymizer::Uploader do ...@@ -7,7 +7,7 @@ describe Pseudonymizer::Uploader do
config: YAML.load_file(Rails.root.join(Gitlab.config.pseudonymizer.manifest)) config: YAML.load_file(Rails.root.join(Gitlab.config.pseudonymizer.manifest))
) )
end end
let(:remote_directory) { described_class.remote_directory } let(:remote_directory) { subject.send(:remote_directory) }
subject { described_class.new(options) } subject { described_class.new(options) }
def mock_file(file_name) def mock_file(file_name)
...@@ -27,7 +27,7 @@ describe Pseudonymizer::Uploader do ...@@ -27,7 +27,7 @@ describe Pseudonymizer::Uploader do
it "upload all file in the directory" do it "upload all file in the directory" do
subject.upload subject.upload
expect(remote_directory.files.count).to eq(12) expect(remote_directory.files.all.count).to eq(12)
end end
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