Skip to content

ExpectThunk proposal #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Jun 13, 2019
Merged

ExpectThunk proposal #19

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
04b9cff
ExpectThunk proposal
obj-p Feb 14, 2019
dc21ace
wowza trailing spaces
obj-p Feb 14, 2019
6d06241
adding ability to pass custom assertion block
obj-p Feb 14, 2019
0118c5e
refactoring ExpectThunk away from subclassing, and various tidbits
obj-p Feb 14, 2019
0bf5468
using createThunkMiddleware in ExpectThunk
obj-p Feb 19, 2019
fc20af6
renaming ExpectThunk members
obj-p Feb 19, 2019
aa3e1ce
adding boundary guard and some cleanup
obj-p Feb 20, 2019
a674e51
code style changes
obj-p Feb 20, 2019
6b86566
trailing whitespace
obj-p Feb 20, 2019
0b543e4
removing type as it's inferred
obj-p Feb 20, 2019
5e154b5
adding podspec
obj-p Feb 20, 2019
7e638f1
adding public accessors to getsState and run
obj-p Feb 20, 2019
754dbce
updating podspec
obj-p Feb 20, 2019
063b055
removing podspec and adding subspec
obj-p Feb 21, 2019
c313633
adding preprocessor flag
obj-p Feb 21, 2019
4d8c279
using isEmpty for fun
obj-p Feb 21, 2019
2440ec2
adding a blurb on expect-thunk in README.md
obj-p Feb 25, 2019
a671f34
removing equatable from FakeAction
obj-p Apr 17, 2019
0922abe
New wait/run API as well as dispatched record
obj-p May 18, 2019
8618792
adding wait failed
obj-p May 18, 2019
30f9a96
updating failure descriptions
obj-p May 18, 2019
ff7234f
adding blurb about ExpectThunk subspec
obj-p Jun 11, 2019
5bf1d69
Adding CHANGELOG comment for ExpectThunk
obj-p Jun 13, 2019
f272dc9
add PR reference
DivineDominion Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ReSwift-ThunkTests/ExpectThunk.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import XCTest
import ReSwift
import ReSwiftThunk

public class ExpectThunk<State: StateType> {
public typealias DispatchAssertion = (Action) -> Void
Expand Down
29 changes: 0 additions & 29 deletions ReSwiftExpectThunk.podspec
View file
Open in desktop

This file was deleted.

14 changes: 13 additions & 1 deletion ReSwiftThunk.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,19 @@ Pod::Spec.new do |spec|
spec.source = {
:git => "https://github.com/ReSwift/ReSwift-Thunk.git",
:tag => spec.version.to_s }
spec.source_files = "ReSwift-Thunk"

spec.subspec "Core" do |sp|
sp.source_files = "ReSwift-Thunk"
end

spec.subspec "ExpectThunk" do |sp|
sp.dependency "ReSwiftThunk/Core"
Copy link
Member

@mjarvis mjarvis Apr 17, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you remove this dependency, perhaps the inherited podfile example will work? I think it might be double-importing Core when inherit is included in the test target pod specifications.

Edit: Though, really, cocoapods dependency stuff should really handle this automatically...

Copy link
Contributor Author

@obj-p obj-p Apr 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good thought, however, I wasn't able to get it to build this way. I'm attempting with CocoaPods 1.6.1. It may be an open issue with CocoaPods 7195 having child targets with subspecs. I'll follow up there, it does seem splitting the targets is the workaround in the Podfile at the moment.

sp.pod_target_xcconfig = { "ENABLE_BITCODE" => "NO" }
sp.framework = "XCTest"
sp.source_files = "ReSwift-ThunkTests/ExpectThunk.swift"
end

spec.default_subspec = "Core"

spec.dependency "ReSwift", "~> 4.0"
end