Skip to content

Commit

Permalink
Get rid of Nimble/Quick stuff in RCL fixture
Browse files Browse the repository at this point in the history
It's just too crazy trying to coordinate its building with that of
Carthage. Xcode hates that.
  • Loading branch information
jspahrsummers committed Dec 20, 2014
1 parent 1fd4320 commit 16b1a61
Show file tree
Hide file tree
Showing 16 changed files with 8 additions and 3,085 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,3 @@
[submodule "Carthage/Checkouts/ReactiveTask"]
path = Carthage/Checkouts/ReactiveTask
url = https://github.com/Carthage/ReactiveTask.git
[submodule "Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/Quick"]
path = Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/Quick
url = https://github.com/Quick/Quick.git
8 changes: 4 additions & 4 deletions Source/CarthageKitTests/XcodeSpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import ReactiveTask
class XcodeSpec: QuickSpec {
override func spec() {
let directoryURL = NSBundle(forClass: self.dynamicType).URLForResource("ReactiveCocoaLayout", withExtension: nil)!
let workspaceURL = directoryURL.URLByAppendingPathComponent("ReactiveCocoaLayout.xcworkspace")
let projectURL = directoryURL.URLByAppendingPathComponent("ReactiveCocoaLayout.xcodeproj")
let buildFolderURL = directoryURL.URLByAppendingPathComponent(CarthageBinariesFolderPath)

beforeEach {
Expand Down Expand Up @@ -88,20 +88,20 @@ class XcodeSpec: QuickSpec {
expect(isDirectory).to(beTruthy())
}

it("should locate the workspace") {
it("should locate the project") {
let result = locateProjectsInDirectory(directoryURL).first()
expect(result.error()).to(beNil())

let locator = result.value()!
expect(locator).to(equal(ProjectLocator.Workspace(workspaceURL)))
expect(locator).to(equal(ProjectLocator.ProjectFile(projectURL)))
}

it("should locate the project from the parent directory") {
let result = locateProjectsInDirectory(directoryURL.URLByDeletingLastPathComponent!).first()
expect(result.error()).to(beNil())

let locator = result.value()!
expect(locator).to(equal(ProjectLocator.Workspace(workspaceURL)))
expect(locator).to(equal(ProjectLocator.ProjectFile(projectURL)))
}

it("should not locate the project from a directory not containing it") {
Expand Down
1 change: 0 additions & 1 deletion Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/Quick
Submodule Quick deleted from 315ae2

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 16b1a61

Please sign in to comment.