Skip to content

Swift support for the Cedar test runner #367

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
tjarratt merged 14 commits into from
Jan 15, 2016
Merged

Swift support for the Cedar test runner #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2a017e5
Specs now import Cedar.h instead of CDRSpecHelper.h
briancroom Dec 24, 2015
edf284a
Weaken the Objective-C++ requirement
briancroom Dec 24, 2015
461aa76
Simplify Cedar.h imports
briancroom Dec 24, 2015
025ce00
Add nullability annotations to relevant public headers
briancroom Dec 26, 2015
db50a59
Make the OS X framework define a module
briancroom Dec 26, 2015
7d12832
CDRSpecHelper's singleton accessor is not a factory method
briancroom Dec 28, 2015
0999899
Add a spec for basic BDD runner usage in Swift
briancroom Dec 26, 2015
4bc5098
Move XCTest specs out of the iOS group and add them to the Mac spec b…
briancroom Dec 28, 2015
95d2988
Translate XCTAssert* failures into Cedar spec failures
briancroom Dec 28, 2015
381abb0
Skip building the Swift spec when running rake tasks with Xcode <7.0
briancroom Jan 8, 2016
1c55a6f
Use an NSDictionary subclass as the context for shared example groups
briancroom Jan 8, 2016
e7bee9b
Add Xcode code snippets for Cedar BDD constructs in Swift
briancroom Jan 12, 2016
4ca3f30
Update the Cedar spec template to allow generating Swift specs
briancroom Jan 13, 2016
d5c9b4b
Use a modernized style for the spec template icon, and remove ".mm"
briancroom Jan 13, 2016
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
105 changes: 96 additions & 9 deletions Cedar.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 30 additions & 0 deletions CodeSnippetsAndTemplates/CodeSnippets/caft-swift.codesnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDECodeSnippetCompletionPrefix</key>
<string>caft</string>
<key>IDECodeSnippetCompletionScopes</key>
<array>
<string>CodeExpression</string>
</array>
<key>IDECodeSnippetContents</key>
<string>afterEach {
&lt;#content#&gt;
}</string>
<key>IDECodeSnippetIdentifier</key>
<string>810E8F16-D042-4EAA-A132-AF519E003E6B</string>
<key>IDECodeSnippetLanguage</key>
<string>Xcode.SourceCodeLanguage.Swift</string>
<key>IDECodeSnippetSummary</key>
<string>Cedar after each block for Swift</string>
<key>IDECodeSnippetTitle</key>
<string>Cedar after each - Swift</string>
<key>IDECodeSnippetUserSnippet</key>
<true/>
<key>IDECodeSnippetVersion</key>
<integer>2</integer>
<key>isCedarSnippet</key>
<true/>
</dict>
</plist>
30 changes: 30 additions & 0 deletions CodeSnippetsAndTemplates/CodeSnippets/cbef-swift.codesnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDECodeSnippetCompletionPrefix</key>
<string>cbef</string>
<key>IDECodeSnippetCompletionScopes</key>
<array>
<string>CodeExpression</string>
</array>
<key>IDECodeSnippetContents</key>
<string>beforeEach {
&lt;#content#&gt;
}</string>
<key>IDECodeSnippetIdentifier</key>
<string>33D58ACB-8C55-4ACA-8EAC-02BCE24FCB8D</string>
<key>IDECodeSnippetLanguage</key>
<string>Xcode.SourceCodeLanguage.Swift</string>
<key>IDECodeSnippetSummary</key>
<string>Cedar before each block for Swift</string>
<key>IDECodeSnippetTitle</key>
<string>Cedar before each - Swift</string>
<key>IDECodeSnippetUserSnippet</key>
<true/>
<key>IDECodeSnippetVersion</key>
<integer>2</integer>
<key>isCedarSnippet</key>
<true/>
</dict>
</plist>
26 changes: 26 additions & 0 deletions CodeSnippetsAndTemplates/CodeSnippets/cbl-swift.codesnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDECodeSnippetCompletionPrefix</key>
<string>cbl</string>
<key>IDECodeSnippetCompletionScopes</key>
<array>
<string>CodeExpression</string>
</array>
<key>IDECodeSnippetContents</key>
<string>itShouldBehaveLike("&lt;#shared behavior description#&gt;")</string>
<key>IDECodeSnippetIdentifier</key>
<string>D1A4AEB6-E079-417E-889D-91A1A0B57DD6</string>
<key>IDECodeSnippetLanguage</key>
<string>Xcode.SourceCodeLanguage.Swift</string>
<key>IDECodeSnippetTitle</key>
<string>Cedar should behave like - Swift</string>
<key>IDECodeSnippetUserSnippet</key>
<true/>
<key>IDECodeSnippetVersion</key>
<integer>0</integer>
<key>isCedarSnippet</key>
<true/>
</dict>
</plist>
28 changes: 28 additions & 0 deletions CodeSnippetsAndTemplates/CodeSnippets/cblcont-swift.codesnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDECodeSnippetCompletionPrefix</key>
<string>cblcont</string>
<key>IDECodeSnippetCompletionScopes</key>
<array>
<string>CodeExpression</string>
</array>
<key>IDECodeSnippetContents</key>
<string>itShouldBehaveLike("&lt;#shared behavior description#&gt;") { context in
context["&lt;#context key#&gt;"] = &lt;#context value#&gt;
}</string>
<key>IDECodeSnippetIdentifier</key>
<string>E1094559-F802-489B-9A79-6F281938B0AE</string>
<key>IDECodeSnippetLanguage</key>
<string>Xcode.SourceCodeLanguage.Swift</string>
<key>IDECodeSnippetTitle</key>
<string>Cedar should behave like with context - Swift</string>
<key>IDECodeSnippetUserSnippet</key>
<true/>
<key>IDECodeSnippetVersion</key>
<integer>0</integer>
<key>isCedarSnippet</key>
<true/>
</dict>
</plist>
30 changes: 30 additions & 0 deletions CodeSnippetsAndTemplates/CodeSnippets/ccont-swift.codesnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDECodeSnippetCompletionPrefix</key>
<string>ccont</string>
<key>IDECodeSnippetCompletionScopes</key>
<array>
<string>CodeExpression</string>
</array>
<key>IDECodeSnippetContents</key>
<string>context("&lt;#subject under test#&gt;") {
&lt;#content#&gt;
}</string>
<key>IDECodeSnippetIdentifier</key>
<string>49E13C68-47D4-4A53-BD2F-CC8C0AC5A7B4</string>
<key>IDECodeSnippetLanguage</key>
<string>Xcode.SourceCodeLanguage.Swift</string>
<key>IDECodeSnippetSummary</key>
<string>Cedar context block for Swift</string>
<key>IDECodeSnippetTitle</key>
<string>Cedar context - Swift</string>
<key>IDECodeSnippetUserSnippet</key>
<true/>
<key>IDECodeSnippetVersion</key>
<integer>2</integer>
<key>isCedarSnippet</key>
<true/>
</dict>
</plist>
30 changes: 30 additions & 0 deletions CodeSnippetsAndTemplates/CodeSnippets/cdesc-swift.codesnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDECodeSnippetCompletionPrefix</key>
<string>cdesc</string>
<key>IDECodeSnippetCompletionScopes</key>
<array>
<string>CodeExpression</string>
</array>
<key>IDECodeSnippetContents</key>
<string>describe("&lt;#subject under test#&gt;") {
&lt;#content#&gt;
}</string>
<key>IDECodeSnippetIdentifier</key>
<string>D4EF3325-530D-4873-B90E-D40916A16C3D</string>
<key>IDECodeSnippetLanguage</key>
<string>Xcode.SourceCodeLanguage.Swift</string>
<key>IDECodeSnippetSummary</key>
<string>Cedar describe block for Swift</string>
<key>IDECodeSnippetTitle</key>
<string>Cedar describe - Swift</string>
<key>IDECodeSnippetUserSnippet</key>
<true/>
<key>IDECodeSnippetVersion</key>
<integer>2</integer>
<key>isCedarSnippet</key>
<true/>
</dict>
</plist>
30 changes: 30 additions & 0 deletions CodeSnippetsAndTemplates/CodeSnippets/cexpandpend-swift.codesnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDECodeSnippetCompletionPrefix</key>
<string>PENDING</string>
<key>IDECodeSnippetCompletionScopes</key>
<array>
<string>CodeExpression</string>
</array>
<key>IDECodeSnippetContents</key>
<string>{
&lt;#content#&gt;
}</string>
<key>IDECodeSnippetIdentifier</key>
<string>1EFA7973-08CD-4435-97E7-AC63A6195238</string>
<key>IDECodeSnippetLanguage</key>
<string>Xcode.SourceCodeLanguage.Swift</string>
<key>IDECodeSnippetSummary</key>
<string>Expand a PENDING block to implement it</string>
<key>IDECodeSnippetTitle</key>
<string>Cedar expand pending - Swift</string>
<key>IDECodeSnippetUserSnippet</key>
<true/>
<key>IDECodeSnippetVersion</key>
<integer>2</integer>
<key>isCedarSnippet</key>
<true/>
</dict>
</plist>
30 changes: 30 additions & 0 deletions CodeSnippetsAndTemplates/CodeSnippets/cit-swift.codesnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDECodeSnippetCompletionPrefix</key>
<string>cit</string>
<key>IDECodeSnippetCompletionScopes</key>
<array>
<string>CodeExpression</string>
</array>
<key>IDECodeSnippetContents</key>
<string>it("should &lt;#expected behavior#&gt;") {
&lt;#content#&gt;
}</string>
<key>IDECodeSnippetIdentifier</key>
<string>99C76A65-B23F-421B-AA52-D3C46E30BC28</string>
<key>IDECodeSnippetLanguage</key>
<string>Xcode.SourceCodeLanguage.Swift</string>
<key>IDECodeSnippetSummary</key>
<string>Cedar example block for Swift</string>
<key>IDECodeSnippetTitle</key>
<string>Cedar example - Swift</string>
<key>IDECodeSnippetUserSnippet</key>
<true/>
<key>IDECodeSnippetVersion</key>
<integer>2</integer>
<key>isCedarSnippet</key>
<true/>
</dict>
</plist>
26 changes: 26 additions & 0 deletions CodeSnippetsAndTemplates/CodeSnippets/clog-swift.codesnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDECodeSnippetCompletionScopes</key>
<array>
<string>All</string>
</array>
<key>IDECodeSnippetContents</key>
<string>print("================&gt;", &lt;#value of interest#&gt;)</string>
<key>IDECodeSnippetIdentifier</key>
<string>1AC7A9EF-7EA0-4A7F-B5A4-E749A9940618</string>
<key>IDECodeSnippetLanguage</key>
<string>Xcode.SourceCodeLanguage.Swift</string>
<key>IDECodeSnippetSummary</key>
<string>Log to console output for Swift</string>
<key>IDECodeSnippetTitle</key>
<string>Console log - Swift</string>
<key>IDECodeSnippetUserSnippet</key>
<true/>
<key>IDECodeSnippetVersion</key>
<integer>0</integer>
<key>isCedarSnippet</key>
<true/>
</dict>
</plist>
28 changes: 28 additions & 0 deletions CodeSnippetsAndTemplates/CodeSnippets/cpend-swift.codesnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDECodeSnippetCompletionPrefix</key>
<string>cpend</string>
<key>IDECodeSnippetCompletionScopes</key>
<array>
<string>CodeExpression</string>
</array>
<key>IDECodeSnippetContents</key>
<string>it("should &lt;#expected behavior#&gt;", PENDING)</string>
<key>IDECodeSnippetIdentifier</key>
<string>858980E1-6F1F-4165-9501-F05F737D49F3</string>
<key>IDECodeSnippetLanguage</key>
<string>Xcode.SourceCodeLanguage.Swift</string>
<key>IDECodeSnippetSummary</key>
<string>Cedar pending example block for Swift</string>
<key>IDECodeSnippetTitle</key>
<string>Cedar pending example - Swift</string>
<key>IDECodeSnippetUserSnippet</key>
<true/>
<key>IDECodeSnippetVersion</key>
<integer>2</integer>
<key>isCedarSnippet</key>
<true/>
</dict>
</plist>
30 changes: 30 additions & 0 deletions CodeSnippetsAndTemplates/CodeSnippets/cshare-swift.codesnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDECodeSnippetCompletionPrefix</key>
<string>cshare</string>
<key>IDECodeSnippetCompletionScopes</key>
<array>
<string>CodeExpression</string>
</array>
<key>IDECodeSnippetContents</key>
<string>sharedExamplesFor("&lt;#shared behavior description#&gt;") { context in
&lt;#content#&gt;
}</string>
<key>IDECodeSnippetIdentifier</key>
<string>0E3FC2BE-CAB4-4BA6-B8AF-D676588419B0</string>
<key>IDECodeSnippetLanguage</key>
<string>Xcode.SourceCodeLanguage.Swift</string>
<key>IDECodeSnippetSummary</key>
<string>Cedar shared examples for Swift</string>
<key>IDECodeSnippetTitle</key>
<string>Cedar shared example group - Swift</string>
<key>IDECodeSnippetUserSnippet</key>
<true/>
<key>IDECodeSnippetVersion</key>
<integer>2</integer>
<key>isCedarSnippet</key>
<true/>
</dict>
</plist>
28 changes: 28 additions & 0 deletions CodeSnippetsAndTemplates/CodeSnippets/csubj-swift.codesnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDECodeSnippetCompletionPrefix</key>
<string>csubj</string>
<key>IDECodeSnippetCompletionScopes</key>
<array>
<string>CodeExpression</string>
</array>
<key>IDECodeSnippetContents</key>
<string>subjectAction { &lt;#action#&gt; }</string>
<key>IDECodeSnippetIdentifier</key>
<string>E3B41D04-9235-4952-854C-C6851F5213A5</string>
<key>IDECodeSnippetLanguage</key>
<string>Xcode.SourceCodeLanguage.Swift</string>
<key>IDECodeSnippetSummary</key>
<string>Cedar subject action block for Swift</string>
<key>IDECodeSnippetTitle</key>
<string>Cedar subject action - Swift</string>
<key>IDECodeSnippetUserSnippet</key>
<true/>
<key>IDECodeSnippetVersion</key>
<integer>0</integer>
<key>isCedarSnippet</key>
<true/>
</dict>
</plist>
0 ...Spec.xctemplate/___FILEBASENAME___Spec.mm → ...e/Objective-C++/___FILEBASENAME___Spec.mm
View file
Open in desktop
File renamed without changes.
11 changes: 11 additions & 0 deletions ...s/Templates/File Templates/Cedar/Cedar Spec.xctemplate/Swift/___FILEBASENAME___Spec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Cedar

class ___VARIABLE_cedarClass:identifier___Spec: CDRSpec {
override func declareBehaviors() {
var <#object under test#>: ___VARIABLE_cedarClass:identifier___!

beforeEach {

}
}
}
Binary file removed ...ippetsAndTemplates/Templates/File Templates/Cedar/Cedar Spec.xctemplate/TemplateIcon.icns
View file
Open in desktop
Binary file not shown.
Binary file added ...Templates/Templates/File Templates/Cedar/Cedar Spec.xctemplate/TemplateIcon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...plates/Templates/File Templates/Cedar/Cedar Spec.xctemplate/TemplateIcon@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading