Skip to content

Commit dc13424

Browse files
committed
Set detect_hidden default in create_courier; reorder some more arguments
1 parent 8fad97b commit dc13424

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

test/test_bag_courier.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def setup
126126
def create_courier(
127127
dry_run:,
128128
target_client:,
129-
detect_hidden:,
129+
detect_hidden: true,
130130
validator: @validator,
131131
remove_export: false
132132
)
@@ -135,19 +135,19 @@ def create_courier(
135135
bag_info: @bag_info,
136136
tags: [@aptrust_info],
137137
data_transfer: @data_transfer,
138+
detect_hidden: detect_hidden,
138139
working_dir: @prep_path,
139140
export_dir: @export_path,
140141
remove_export: remove_export,
141142
dry_run: dry_run,
142143
status_event_repo: @status_event_repo,
143144
target_client: target_client,
144-
validator: validator,
145-
detect_hidden: detect_hidden
145+
validator: validator
146146
)
147147
end
148148

149149
def test_deliver_with_dry_run_false
150-
courier = create_courier(dry_run: false, detect_hidden: @detect_hidden, target_client: @mock_target_client)
150+
courier = create_courier(dry_run: false, target_client: @mock_target_client)
151151
expected_tar_file_path = File.join(@export_path, @bag_id.to_s + ".tar")
152152
@mock_target_client.expect(:remote_text, "AWS S3 remote location in bucket fake")
153153
@mock_target_client.expect(:send_file, nil, local_file_path: expected_tar_file_path)
@@ -173,7 +173,7 @@ def test_deliver_with_dry_run_false
173173
end
174174

175175
def test_deliver_with_dry_run
176-
courier = create_courier(dry_run: true, detect_hidden: @detect_hidden, target_client: @mock_target_client)
176+
courier = create_courier(dry_run: true, target_client: @mock_target_client)
177177
courier.deliver
178178
@mock_target_client.verify
179179

@@ -189,7 +189,7 @@ def test_deliver_with_dry_run
189189
end
190190

191191
def test_deliver_when_deposit_raises_error
192-
courier = create_courier(dry_run: false, detect_hidden: @detect_hidden, target_client: @aptrust_target_client)
192+
courier = create_courier(dry_run: false, target_client: @aptrust_target_client)
193193
raise_error = proc { raise RemoteClient::RemoteClientError, "specific details" }
194194
@aptrust_target_client.stub :send_file, raise_error do
195195
courier.deliver
@@ -203,7 +203,7 @@ def test_deliver_when_deposit_raises_error
203203
end
204204

205205
def test_deliver_with_remove_export
206-
courier = create_courier(dry_run: false, detect_hidden: @detect_hidden, target_client: @mock_target_client, remove_export: true)
206+
courier = create_courier(dry_run: false, target_client: @mock_target_client, remove_export: true)
207207
expected_tar_file_path = File.join(@export_path, @bag_id.to_s + ".tar")
208208
@mock_target_client.expect(:remote_text, "AWS S3 remote location in bucket fake")
209209
@mock_target_client.expect(:send_file, nil, local_file_path: expected_tar_file_path)

test/test_dispatcher.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ def setup
5050
repository: repository,
5151
context: "some-context",
5252
extra_bag_info_data: {"something_extra" => true},
53+
detect_hidden: @detect_hidden,
5354
target_client: target_client,
5455
bag_repo: BagRepository::BagDatabaseRepository.new,
55-
status_event_repo: StatusEventRepository::StatusEventDatabaseRepository.new,
56-
detect_hidden: @detect_hidden
56+
status_event_repo: StatusEventRepository::StatusEventDatabaseRepository.new
5757
)
5858

5959
@bag_identifier = "some-repo.some-context-00001"

0 commit comments

Comments
 (0)