Skip to content

Commit

Permalink
Merge branch 'master' into v8
Browse files Browse the repository at this point in the history
# Conflicts:
#	Sources/Cache/DiskStorage.swift
#	Sources/Cache/ImageCache.swift
#	Sources/General/KFOptionsSetter.swift
#	Sources/General/KingfisherManager.swift
#	Sources/Networking/ImagePrefetcher.swift
#	Sources/Networking/RedirectHandler.swift
#	Tests/KingfisherTests/ImageExtensionTests.swift
  • Loading branch information
onevcat committed May 3, 2024
2 parents 893f933 + a4d1b0f commit 6c3f663
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let package = Package(
.target(
name: "Kingfisher",
path: "Sources",
resources: [.copy("PrivacyInfo.xcprivacy")]
resources: [.process("PrivacyInfo.xcprivacy")]
)
]
)
4 changes: 2 additions & 2 deletions Sources/Views/AnimatedImageView.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
//
// AnimatableImageView.swift
// AnimatedImageView.swift
// Kingfisher
//
// Created by bl4ckra1sond3tre on 4/22/16.
//
// The AnimatableImageView, AnimatedFrame and Animator is a modified version of
// The AnimatedImageView, AnimatedFrame and Animator is a modified version of
// some classes from kaishin's Gifu project (https://github.com/kaishin/Gifu)
//
// The MIT License (MIT)
Expand Down
4 changes: 2 additions & 2 deletions Tests/Dependency/Nocilla/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ stubRequest(@"GET", @"http://www.google.com").andReturn(404);
```
#### Returning a specific status code and header
The same approch here, you can use `withHeader` or `withHeaders`
The same approach here, you can use `withHeader` or `withHeaders`
```objc
stubRequest(@"POST", @"https://api.example.com/dogs.json").
Expand Down Expand Up @@ -184,7 +184,7 @@ If some request is made but it wasn't stubbed, Nocilla won't let that request hi
At this moment Nocilla will raise an exception with a meaningful message about the error and how to solve it, including a snippet of code on how to stub the unexpected request.

### Testing asynchronous requests
When testing asynchrounous requests your request will be sent on a different thread from the one on which your test is executed. It is important to keep this in mind, and design your test in such a way that is has enough time to finish. For instance ```tearDown()``` when using ```XCTest``` and ```afterEach()``` when using [Quick](https://github.com/Quick/Quick) and [Nimble](https://github.com/Quick/Nimble) will cause the request never to complete.
When testing asynchronous requests your request will be sent on a different thread from the one on which your test is executed. It is important to keep this in mind, and design your test in such a way that is has enough time to finish. For instance ```tearDown()``` when using ```XCTest``` and ```afterEach()``` when using [Quick](https://github.com/Quick/Quick) and [Nimble](https://github.com/Quick/Nimble) will cause the request never to complete.


## Who uses Nocilla.
Expand Down

0 comments on commit 6c3f663

Please sign in to comment.