Commit 5e9f8005 authored by Nick Thomas's avatar Nick Thomas

Geo: Don't sync disabled project wikis

parent ec186e1d
...@@ -20,19 +20,29 @@ class Geo::ProjectRegistry < Geo::BaseRegistry ...@@ -20,19 +20,29 @@ class Geo::ProjectRegistry < Geo::BaseRegistry
.where(resync_repository: false, resync_wiki: false) .where(resync_repository: false, resync_wiki: false)
end end
def resync_repository? def repository_sync_due?(scheduled_time)
resync_repository || last_repository_successful_sync_at.nil? never_synced_repository? || repository_sync_needed?(scheduled_time)
end end
def resync_wiki? def wiki_sync_due?(scheduled_time)
resync_wiki || last_wiki_successful_sync_at.nil? project.wiki_enabled? && (never_synced_wiki? || wiki_sync_needed?(scheduled_time))
end end
def repository_synced_since?(timestamp) private
last_repository_synced_at && last_repository_synced_at > timestamp
def never_synced_repository?
last_repository_successful_sync_at.nil?
end
def never_synced_wiki?
last_wiki_successful_sync_at.nil?
end
def repository_sync_needed?(timestamp)
resync_repository? && (last_repository_synced_at.nil? || timestamp > last_repository_synced_at)
end end
def wiki_synced_since?(timestamp) def wiki_sync_needed?(timestamp)
last_wiki_synced_at && last_wiki_synced_at > timestamp resync_wiki? && (last_wiki_synced_at.nil? || timestamp > last_wiki_synced_at)
end end
end end
...@@ -10,7 +10,7 @@ module Geo ...@@ -10,7 +10,7 @@ module Geo
repository_storage_name: project.repository.storage, repository_storage_name: project.repository.storage,
repository_storage_path: project.repository_storage_path, repository_storage_path: project.repository_storage_path,
repo_path: project.disk_path, repo_path: project.disk_path,
wiki_path: "#{project.disk_path}.wiki", wiki_path: ("#{project.disk_path}.wiki" if project.wiki_enabled?),
project_name: project.name project_name: project.name
) )
end end
......
...@@ -11,30 +11,16 @@ module Geo ...@@ -11,30 +11,16 @@ module Geo
end end
def perform(project_id, scheduled_time) def perform(project_id, scheduled_time)
project = Project.find(project_id)
registry = Geo::ProjectRegistry.find_or_initialize_by(project_id: project_id) registry = Geo::ProjectRegistry.find_or_initialize_by(project_id: project_id)
project = registry.project
Geo::RepositorySyncService.new(project).execute if sync_repository?(registry, scheduled_time) if project.nil?
Geo::WikiSyncService.new(project).execute if sync_wiki?(registry, scheduled_time) Gitlab::Geo::Logger.error(class: self.class.name, message: "Couldn't find project, skipping syncing", project_id: project_id)
rescue ActiveRecord::RecordNotFound => e return
Gitlab::Geo::Logger.error( end
class: self.class.name,
message: "Couldn't find project, skipping syncing",
project_id: project_id,
error: e
)
end
private
def sync_repository?(registry, scheduled_time)
!registry.repository_synced_since?(scheduled_time) &&
registry.resync_repository?
end
def sync_wiki?(registry, scheduled_time) Geo::RepositorySyncService.new(project).execute if registry.repository_sync_due?(scheduled_time)
!registry.wiki_synced_since?(scheduled_time) && Geo::WikiSyncService.new(project).execute if registry.wiki_sync_due?(scheduled_time)
registry.resync_wiki?
end end
end end
end end
---
title: 'Geo: Don''t sync disabled project wikis'
merge_request: 3109
author:
type: fixed
...@@ -19,9 +19,7 @@ module Gitlab ...@@ -19,9 +19,7 @@ module Gitlab
full_scan! if options[:full_scan] full_scan! if options[:full_scan]
until exit? until exit?
Events.fetch_in_batches do |batch| run_once!
handle_events(batch)
end
return if exit? return if exit?
...@@ -30,6 +28,10 @@ module Gitlab ...@@ -30,6 +28,10 @@ module Gitlab
end end
end end
def run_once!
Events.fetch_in_batches { |batch| handle_events(batch) }
end
# Execute routines to verify the required initial data is available # Execute routines to verify the required initial data is available
# and mark non-replicated data as requiring replication. # and mark non-replicated data as requiring replication.
def full_scan! def full_scan!
......
...@@ -24,7 +24,7 @@ FactoryGirl.define do ...@@ -24,7 +24,7 @@ FactoryGirl.define do
repository_storage_path { project.repository_storage_path } repository_storage_path { project.repository_storage_path }
add_attribute(:repo_path) { project.disk_path } add_attribute(:repo_path) { project.disk_path }
project_name { project.name } project_name { project.name }
wiki_path { "{project.disk_path}.wiki" } wiki_path { "#{project.disk_path}.wiki" }
end end
factory :geo_repository_updated_event, class: Geo::RepositoryUpdatedEvent do factory :geo_repository_updated_event, class: Geo::RepositoryUpdatedEvent do
......
...@@ -3,48 +3,70 @@ require 'spec_helper' ...@@ -3,48 +3,70 @@ require 'spec_helper'
describe Gitlab::Geo::LogCursor::Daemon, :postgresql do describe Gitlab::Geo::LogCursor::Daemon, :postgresql do
include ::EE::GeoHelpers include ::EE::GeoHelpers
set(:primary) { create(:geo_node, :primary) }
set(:secondary) { create(:geo_node) }
let(:options) { {} }
subject(:daemon) { described_class.new(options) }
around do |example|
Sidekiq::Testing.fake! { example.run }
end
before do
stub_current_geo_node(secondary)
stub_env("::#{described_class}::POOL_WAIT", 0.1)
allow(daemon).to receive(:trap_signals)
end
describe '#run!' do describe '#run!' do
set(:geo_node) { create(:geo_node, :primary) } it 'traps signals' do
is_expected.to receive(:exit?).and_return(true)
is_expected.to receive(:trap_signals)
before do daemon.run!
stub_current_geo_node(geo_node)
end end
it 'traps signals' do it 'does not perform a full scan by default' do
allow(subject).to receive(:exit?) { true } is_expected.to receive(:exit?).and_return(true)
expect(subject).to receive(:trap_signals) is_expected.not_to receive(:full_scan!)
subject.run! daemon.run!
end end
context 'when the command-line defines full_scan: true' do context 'the command-line defines full_scan: true' do
subject { described_class.new(full_scan: true) } let(:options) { { full_scan: true } }
it 'executes a full-scan' do it 'executes a full-scan' do
allow(subject).to receive(:exit?) { true } is_expected.to receive(:exit?).and_return(true)
is_expected.to receive(:full_scan!)
expect(subject).to receive(:full_scan!) daemon.run!
subject.run!
end end
end end
it 'delegates to #run_once! in a loop' do
is_expected.to receive(:exit?).and_return(false, false, false, true)
is_expected.to receive(:run_once!).twice
daemon.run!
end
end
describe '#run_once!' do
context 'when replaying a repository created event' do context 'when replaying a repository created event' do
let(:project) { create(:project) } let(:project) { create(:project) }
let(:repository_created_event) { create(:geo_repository_created_event, project: project) } let(:repository_created_event) { create(:geo_repository_created_event, project: project) }
let(:event_log) { create(:geo_event_log, repository_created_event: repository_created_event) } let(:event_log) { create(:geo_event_log, repository_created_event: repository_created_event) }
let!(:event_log_state) { create(:geo_event_log_state, event_id: event_log.id - 1) } let!(:event_log_state) { create(:geo_event_log_state, event_id: event_log.id - 1) }
before do
allow(subject).to receive(:exit?).and_return(false, true)
end
it 'creates a new project registry' do it 'creates a new project registry' do
expect { subject.run! }.to change(Geo::ProjectRegistry, :count).by(1) expect { daemon.run_once! }.to change(Geo::ProjectRegistry, :count).by(1)
end end
it 'sets resync attributes to true' do it 'sets resync attributes to true' do
subject.run! daemon.run_once!
registry = Geo::ProjectRegistry.last registry = Geo::ProjectRegistry.last
...@@ -52,9 +74,9 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do ...@@ -52,9 +74,9 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do
end end
it 'sets resync_wiki to false if wiki_path is nil' do it 'sets resync_wiki to false if wiki_path is nil' do
repository_created_event.update_attribute(:wiki_path, nil) repository_created_event.update!(wiki_path: nil)
subject.run! daemon.run_once!
registry = Geo::ProjectRegistry.last registry = Geo::ProjectRegistry.last
...@@ -65,7 +87,7 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do ...@@ -65,7 +87,7 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do
expect(Geo::ProjectSyncWorker).to receive(:perform_async) expect(Geo::ProjectSyncWorker).to receive(:perform_async)
.with(project.id, anything).once .with(project.id, anything).once
subject.run! daemon.run_once!
end end
end end
...@@ -75,28 +97,24 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do ...@@ -75,28 +97,24 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do
let(:event_log) { create(:geo_event_log, repository_updated_event: repository_updated_event) } let(:event_log) { create(:geo_event_log, repository_updated_event: repository_updated_event) }
let!(:event_log_state) { create(:geo_event_log_state, event_id: event_log.id - 1) } let!(:event_log_state) { create(:geo_event_log_state, event_id: event_log.id - 1) }
before do
allow(subject).to receive(:exit?).and_return(false, true)
end
it 'creates a new project registry if it does not exist' do it 'creates a new project registry if it does not exist' do
expect { subject.run! }.to change(Geo::ProjectRegistry, :count).by(1) expect { daemon.run_once! }.to change(Geo::ProjectRegistry, :count).by(1)
end end
it 'sets resync_repository to true if event source is repository' do it 'sets resync_repository to true if event source is repository' do
repository_updated_event.update_attribute(:source, Geo::RepositoryUpdatedEvent::REPOSITORY) repository_updated_event.update!(source: Geo::RepositoryUpdatedEvent::REPOSITORY)
registry = create(:geo_project_registry, :synced, project: repository_updated_event.project) registry = create(:geo_project_registry, :synced, project: repository_updated_event.project)
subject.run! daemon.run_once!
expect(registry.reload.resync_repository).to be true expect(registry.reload.resync_repository).to be true
end end
it 'sets resync_wiki to true if event source is wiki' do it 'sets resync_wiki to true if event source is wiki' do
repository_updated_event.update_attribute(:source, Geo::RepositoryUpdatedEvent::WIKI) repository_updated_event.update!(source: Geo::RepositoryUpdatedEvent::WIKI)
registry = create(:geo_project_registry, :synced, project: repository_updated_event.project) registry = create(:geo_project_registry, :synced, project: repository_updated_event.project)
subject.run! daemon.run_once!
expect(registry.reload.resync_wiki).to be true expect(registry.reload.resync_wiki).to be true
end end
...@@ -105,7 +123,7 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do ...@@ -105,7 +123,7 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do
expect(Geo::ProjectSyncWorker).to receive(:perform_async) expect(Geo::ProjectSyncWorker).to receive(:perform_async)
.with(project.id, anything).once .with(project.id, anything).once
subject.run! daemon.run_once!
end end
end end
...@@ -115,12 +133,8 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do ...@@ -115,12 +133,8 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do
let!(:event_log_state) { create(:geo_event_log_state, event_id: event_log.id - 1) } let!(:event_log_state) { create(:geo_event_log_state, event_id: event_log.id - 1) }
let(:repository_deleted_event) { event_log.repository_deleted_event } let(:repository_deleted_event) { event_log.repository_deleted_event }
before do
allow(subject).to receive(:exit?).and_return(false, true)
end
it 'does not create a new project registry' do it 'does not create a new project registry' do
expect { subject.run! }.not_to change(Geo::ProjectRegistry, :count) expect { daemon.run_once! }.not_to change(Geo::ProjectRegistry, :count)
end end
it 'schedules a GeoRepositoryDestroyWorker' do it 'schedules a GeoRepositoryDestroyWorker' do
...@@ -132,24 +146,19 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do ...@@ -132,24 +146,19 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do
expect(::GeoRepositoryDestroyWorker).to receive(:perform_async) expect(::GeoRepositoryDestroyWorker).to receive(:perform_async)
.with(project_id, project_name, full_path, project.repository_storage) .with(project_id, project_name, full_path, project.repository_storage)
subject.run! daemon.run_once!
end end
end end
context 'when replaying a repositories changed event' do context 'when replaying a repositories changed event' do
let(:geo_node) { create(:geo_node) } let(:repositories_changed_event) { create(:geo_repositories_changed_event, geo_node: secondary) }
let(:repositories_changed_event) { create(:geo_repositories_changed_event, geo_node: geo_node) }
let(:event_log) { create(:geo_event_log, repositories_changed_event: repositories_changed_event) } let(:event_log) { create(:geo_event_log, repositories_changed_event: repositories_changed_event) }
let!(:event_log_state) { create(:geo_event_log_state, event_id: event_log.id - 1) } let!(:event_log_state) { create(:geo_event_log_state, event_id: event_log.id - 1) }
before do
allow(subject).to receive(:exit?).and_return(false, true)
end
it 'schedules a GeoRepositoryDestroyWorker when event node is the current node' do it 'schedules a GeoRepositoryDestroyWorker when event node is the current node' do
expect(Geo::RepositoriesCleanUpWorker).to receive(:perform_in).with(within(5.minutes).of(1.hour), geo_node.id) expect(Geo::RepositoriesCleanUpWorker).to receive(:perform_in).with(within(5.minutes).of(1.hour), secondary.id)
subject.run! daemon.run_once!
end end
it 'does not schedule a GeoRepositoryDestroyWorker when event node is not the current node' do it 'does not schedule a GeoRepositoryDestroyWorker when event node is not the current node' do
...@@ -157,7 +166,7 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do ...@@ -157,7 +166,7 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do
expect(Geo::RepositoriesCleanUpWorker).not_to receive(:perform_in) expect(Geo::RepositoriesCleanUpWorker).not_to receive(:perform_in)
subject.run! daemon.run_once!
end end
end end
...@@ -170,36 +179,19 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do ...@@ -170,36 +179,19 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do
let!(:event_log_state) { create(:geo_event_log_state, event_id: event_log.id - 1) } let!(:event_log_state) { create(:geo_event_log_state, event_id: event_log.id - 1) }
before do before do
allow(subject).to receive(:exit?).and_return(false, true)
allow(Geo::ProjectSyncWorker).to receive(:perform_async) allow(Geo::ProjectSyncWorker).to receive(:perform_async)
end end
it 'replays events for projects that belong to selected namespaces to replicate' do it 'replays events for projects that belong to selected namespaces to replicate' do
geo_node.update_attribute(:namespaces, [group_1]) secondary.update!(namespaces: [group_1])
expect { subject.run! }.to change(Geo::ProjectRegistry, :count).by(1) expect { daemon.run_once! }.to change(Geo::ProjectRegistry, :count).by(1)
end end
it 'does not replay events for projects that do not belong to selected namespaces to replicate' do it 'does not replay events for projects that do not belong to selected namespaces to replicate' do
geo_node.update_attribute(:namespaces, [group_2]) secondary.update!(namespaces: [group_2])
expect { subject.run! }.not_to change(Geo::ProjectRegistry, :count) expect { daemon.run_once! }.not_to change(Geo::ProjectRegistry, :count)
end
context 'when performing a full scan' do
subject { described_class.new(full_scan: true) }
it 'creates registries for missing projects that belong to selected namespaces' do
geo_node.update_attribute(:namespaces, [group_1])
expect { subject.run! }.to change(Geo::ProjectRegistry, :count).by(1)
end
it 'does not create registries for missing projects that do not belong to selected namespaces' do
geo_node.update_attribute(:namespaces, [group_2])
expect { subject.run! }.not_to change(Geo::ProjectRegistry, :count)
end
end end
end end
...@@ -209,12 +201,8 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do ...@@ -209,12 +201,8 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do
let!(:event_log_state) { create(:geo_event_log_state, event_id: event_log.id - 1) } let!(:event_log_state) { create(:geo_event_log_state, event_id: event_log.id - 1) }
let(:repository_rename_event) { event_log.repository_renamed_event } let(:repository_rename_event) { event_log.repository_renamed_event }
before do
allow(subject).to receive(:exit?).and_return(false, true)
end
it 'does not create a new project registry' do it 'does not create a new project registry' do
expect { subject.run! }.not_to change(Geo::ProjectRegistry, :count) expect { daemon.run_once! }.not_to change(Geo::ProjectRegistry, :count)
end end
it 'schedules a GeoRepositoryDestroyWorker' do it 'schedules a GeoRepositoryDestroyWorker' do
...@@ -225,7 +213,25 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do ...@@ -225,7 +213,25 @@ describe Gitlab::Geo::LogCursor::Daemon, :postgresql do
expect(::GeoRepositoryMoveWorker).to receive(:perform_async) expect(::GeoRepositoryMoveWorker).to receive(:perform_async)
.with(project_id, '', old_path_with_namespace, new_path_with_namespace) .with(project_id, '', old_path_with_namespace, new_path_with_namespace)
subject.run! daemon.run_once!
end
end
end
describe '#full_scan!' do
let(:project) { create(:project) }
context 'with selective sync enabled' do
it 'creates registries for missing projects that belong to selected namespaces' do
secondary.update!(namespaces: [project.namespace])
expect { daemon.full_scan! }.to change(Geo::ProjectRegistry, :count).by(1)
end
it 'does not create registries for missing projects that do not belong to selected namespaces' do
secondary.update!(namespaces: [create(:group)])
expect { daemon.full_scan! }.not_to change(Geo::ProjectRegistry, :count)
end end
end end
end end
......
require 'spec_helper' require 'spec_helper'
describe Geo::ProjectRegistry do describe Geo::ProjectRegistry do
subject { create(:geo_project_registry) } using RSpec::Parameterized::TableSyntax
set(:project) { create(:project) }
set(:registry) { create(:geo_project_registry, project_id: project.id) }
subject { registry }
describe 'relationships' do describe 'relationships' do
it { is_expected.to belong_to(:project) } it { is_expected.to belong_to(:project) }
...@@ -33,85 +38,79 @@ describe Geo::ProjectRegistry do ...@@ -33,85 +38,79 @@ describe Geo::ProjectRegistry do
end end
end end
describe '#resync_repository?' do describe '#repository_sync_due?' do
it 'returns true when resync_repository is true' do where(:resync_repository, :last_successful_sync, :last_sync, :expected) do
subject.resync_repository = true now = Time.now
past = now - 1.year
expect(subject.resync_repository).to be true future = now + 1.year
end
true | nil | nil | true
it 'returns true when last_repository_successful_sync_at is nil' do true | now | nil | true
subject.last_repository_successful_sync_at = nil false | nil | nil | true
false | now | nil | false
expect(subject.resync_repository).to be true
end true | nil | past | true
true | now | past | true
it 'returns false when resync_repository is false and last_repository_successful_sync_at is present' do false | nil | past | true
subject.resync_repository = false false | now | past | false
subject.last_repository_successful_sync_at = Time.now
true | nil | future | true
expect(subject.resync_repository).to be false true | now | future | false
end false | nil | future | true
end false | now | future | false
describe '#resync_wiki?' do
it 'returns true when resync_wiki is true' do
subject.resync_wiki = true
expect(subject.resync_wiki).to be true
end end
it 'returns true when last_wiki_successful_sync_at is nil' do with_them do
subject.last_wiki_successful_sync_at = nil before do
registry.update!(resync_repository: resync_repository, last_repository_successful_sync_at: last_successful_sync, last_repository_synced_at: last_sync)
end
expect(subject.resync_wiki).to be true subject { registry.repository_sync_due?(Time.now) }
end
it 'returns false when resync_wiki is false and last_wiki_successful_sync_at is present' do
subject.resync_wiki = false
subject.last_wiki_successful_sync_at = Time.now
expect(subject.resync_wiki).to be false it { is_expected.to eq(expected) }
end end
end end
describe '#repository_synced_since?' do describe '#wiki_sync_due?' do
it 'returns false when last_repository_synced_at is nil' do where(:resync_wiki, :last_successful_sync, :last_sync, :expected) do
subject.last_repository_synced_at = nil now = Time.now
past = now - 1.year
expect(subject.repository_synced_since?(Time.now)).to be_nil future = now + 1.year
true | nil | nil | true
true | now | nil | true
false | nil | nil | true
false | now | nil | false
true | nil | past | true
true | now | past | true
false | nil | past | true
false | now | past | false
true | nil | future | true
true | now | future | false
false | nil | future | true
false | now | future | false
end end
it 'returns false when last_repository_synced_at before timestamp' do with_them do
subject.last_repository_synced_at = Time.now - 2.hours before do
registry.update!(resync_wiki: resync_wiki, last_wiki_successful_sync_at: last_successful_sync, last_wiki_synced_at: last_sync)
end
expect(subject.repository_synced_since?(Time.now)).to be false subject { registry.wiki_sync_due?(Time.now) }
end
it 'returns true when last_repository_synced_at after timestamp' do context 'wiki enabled' do
subject.last_repository_synced_at = Time.now + 2.hours it { is_expected.to eq(expected) }
end
expect(subject.repository_synced_since?(Time.now)).to be true
end
end
describe '#wiki_synced_since?' do
it 'returns false when last_wiki_synced_at is nil' do
subject.last_wiki_synced_at = nil
expect(subject.wiki_synced_since?(Time.now)).to be_nil
end
it 'returns false when last_wiki_synced_at before timestamp' do
subject.last_wiki_synced_at = Time.now - 2.hours
expect(subject.wiki_synced_since?(Time.now)).to be false
end
it 'returns true when last_wiki_synced_at after timestamp' do context 'wiki disabled' do
subject.last_wiki_synced_at = Time.now + 2.hours before do
project.update!(wiki_enabled: false)
end
expect(subject.wiki_synced_since?(Time.now)).to be true it { is_expected.to be_falsy }
end
end end
end end
end end
require 'spec_helper' require 'spec_helper'
describe Geo::RepositoryCreatedEventStore do describe Geo::RepositoryCreatedEventStore do
let(:project) { create(:project) } set(:project) { create(:project) }
subject(:event) { described_class.new(project) } subject(:create!) { described_class.new(project).create }
describe '#create' do describe '#create' do
it 'does not create an event when not running on a primary node' do it 'does not create an event when not running on a primary node' do
allow(Gitlab::Geo).to receive(:primary?) { false } allow(Gitlab::Geo).to receive(:primary?) { false }
expect { event.create }.not_to change(Geo::RepositoryCreatedEvent, :count) expect { create! }.not_to change(Geo::RepositoryCreatedEvent, :count)
end end
context 'when running on a primary node' do context 'running on a primary node' do
before do before do
allow(Gitlab::Geo).to receive(:primary?) { true } allow(Gitlab::Geo).to receive(:primary?) { true }
end end
it 'creates a created event' do it 'creates a created event' do
expect { event.create }.to change(Geo::RepositoryCreatedEvent, :count).by(1) expect { create! }.to change(Geo::RepositoryCreatedEvent, :count).by(1)
end end
it 'tracks information for the created project' do it 'tracks information for the created project' do
event.create create!
event = Geo::RepositoryCreatedEvent.last event = Geo::RepositoryCreatedEvent.last
...@@ -35,6 +35,15 @@ describe Geo::RepositoryCreatedEventStore do ...@@ -35,6 +35,15 @@ describe Geo::RepositoryCreatedEventStore do
repository_storage_path: project.repository_storage_path repository_storage_path: project.repository_storage_path
) )
end end
it 'does not set a wiki path if the wiki is disabled' do
project.update!(wiki_enabled: false)
create!
event = Geo::RepositoryCreatedEvent.last
expect(event.wiki_path).to be_nil
end
end end
end end
end end
...@@ -102,6 +102,23 @@ RSpec.describe Geo::ProjectSyncWorker do ...@@ -102,6 +102,23 @@ RSpec.describe Geo::ProjectSyncWorker do
end end
end end
context 'wiki is not enabled for project' do
let!(:registry) { create(:geo_project_registry, resync_repository: true, resync_wiki: true, project: project) }
before do
project.update!(wiki_enabled: false)
subject.perform(project.id, Time.now)
end
it 'syncs the project repository' do
expect(repository_sync_service).to have_received(:execute)
end
it 'does not sync the project wiki' do
expect(wiki_sync_service).not_to have_received(:execute)
end
end
context 'when project repository was synced after the time the job was scheduled in' do context 'when project repository was synced after the time the job was scheduled in' do
it 'does not perform Geo::RepositorySyncService for the given project' do it 'does not perform Geo::RepositorySyncService for the given project' do
create(:geo_project_registry, :synced, :repository_dirty, project: project, last_repository_synced_at: Time.now) create(:geo_project_registry, :synced, :repository_dirty, project: project, last_repository_synced_at: Time.now)
......
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