Add RACCommandError to bridged Swift errors

ReactiveCocoa · Jan 7, 2019 · cbb7d90 · cbb7d90
1 parent ffd5478
commit cbb7d90
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/ReactiveObjC/Deprecations+Removals.swift b/ReactiveObjC/Deprecations+Removals.swift
@@ -6,6 +6,9 @@
 //  Copyright © 2018 GitHub. All rights reserved.
 //
 
+@available(*, deprecated, renamed: "RACSignalError.notEnabled")
+public let RACCommandErrorNotEnabled = RACCommandError.notEnabled.rawValue
+
 @available(*, deprecated, renamed: "RACSignalError.noMatchingCase")
 public let RACSignalErrorNoMatchingCase = RACSignalError.noMatchingCase.rawValue
 

diff --git a/ReactiveObjC/RACCommand.h b/ReactiveObjC/RACCommand.h
@@ -13,10 +13,12 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /// The domain for errors originating within `RACCommand`.
-extern NSString * const RACCommandErrorDomain;
+extern NSErrorDomain const RACCommandErrorDomain;
 
-/// -execute: was invoked while the command was disabled.
-extern const NSInteger RACCommandErrorNotEnabled;
+typedef NS_ERROR_ENUM(RACCommandErrorDomain, RACCommandError) {
+	/// -execute: was invoked while the command was disabled.
+	RACCommandErrorNotEnabled = 1,
+};
 
 /// A `userInfo` key for an error, associated with the `RACCommand` that the
 /// error originated from.

diff --git a/ReactiveObjC/RACCommand.m b/ReactiveObjC/RACCommand.m
@@ -19,11 +19,9 @@
 #import "RACSignal+Operations.h"
 #import <libkern/OSAtomic.h>
 
-NSString * const RACCommandErrorDomain = @"RACCommandErrorDomain";
+NSErrorDomain const RACCommandErrorDomain = @"RACCommandErrorDomain";
 NSString * const RACUnderlyingCommandErrorKey = @"RACUnderlyingCommandErrorKey";
 
-const NSInteger RACCommandErrorNotEnabled = 1;
-
 @interface RACCommand () {
 	// Atomic backing variable for `allowsConcurrentExecution`.
 	volatile uint32_t _allowsConcurrentExecution;

diff --git a/ReactiveObjCTests/RACSwiftBridgingSpec.swift b/ReactiveObjCTests/RACSwiftBridgingSpec.swift
@@ -4,6 +4,13 @@ import ReactiveObjC
 
 final class RACSwiftBridgingSpec: QuickSpec {
 	override func spec() {
+		describe("RACCommandError") {
+			it("bridges RACCommandErrorNotEnabled to a Swift error code") {
+				let error: Error = NSError(domain: RACCommandErrorDomain, code: 1)
+				expect(RACCommandError.notEnabled ~= error).to(beTrue())
+			}
+		}
+
 		describe("RACSignalError") {
 			it("bridges RACSignalErrorTimedOut to a Swift error code") {
 				let error: Error = NSError(domain: RACSignalErrorDomain, code: 1)