cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #186 from lightsprint09/travis-test-imporvements

Browse Source 
Travis test imporvements
This commit is contained in:
Erik Little 2015-09-19 16:41:35 -04:00
commit e2cd910fa7
5 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -3,3 +3,8 @@ xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
xcode_scheme: SocketIO-iOS xcode_scheme: SocketIO-iOS
osx_image: xcode7 osx_image: xcode7
script: xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-iOS -sdk iphonesimulator build test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO script: xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-iOS -sdk iphonesimulator build test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
before_install:
install: cd Socket.IO-Test-Server/ && npm install && cd .. && node Socket.IO-Test-Server/main.js &
cache:
directories:
- Socket.IO-Test-Server/node_modules

8
Socket.IO-Test-Server/main.js
View File

@ -1,6 +1,8 @@
var app = require('express')() var app = require('http').createServer()
var server = app.listen(6979) var io = require('socket.io')(app);
var io = require('socket.io')(server) app.listen(6979)
var acknowledgementsEvents = require("./acknowledgementEvents.js") var acknowledgementsEvents = require("./acknowledgementEvents.js")
var emitEvents = require("./emitEvents.js") var emitEvents = require("./emitEvents.js")
var socketEventRegister = require("./socketEventRegister.js") var socketEventRegister = require("./socketEventRegister.js")

1
Socket.IO-Test-Server/package.json
View File

@ -9,7 +9,6 @@
"author": "Lukas Schmidt", "author": "Lukas Schmidt",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"express": "^4.13.1",
"socket.io": "^1.3.6" "socket.io": "^1.3.6"
} }
} }

5
SocketIO-iOSTests/AbstractSocketTest.swift
View File

@ -9,8 +9,7 @@
import XCTest import XCTest
class AbstractSocketTest: XCTestCase { class AbstractSocketTest: XCTestCase {
static let testLocal = false static let serverURL = "localhost:6979"
static let serverURL = AbstractSocketTest.testLocal ? "localhost:6979" : "milkbartube.com:6979"
static let TEST_TIMEOUT = 8.0 static let TEST_TIMEOUT = 8.0
static var socket:SocketIOClient! static var socket:SocketIOClient!
var testKind:TestKind? var testKind:TestKind?
@ -30,6 +29,7 @@ class AbstractSocketTest: XCTestCase {
} }
AbstractSocketTest.socket.connect() AbstractSocketTest.socket.connect()
XCTAssertEqual(AbstractSocketTest.socket.status, SocketIOClientStatus.Connecting) XCTAssertEqual(AbstractSocketTest.socket.status, SocketIOClientStatus.Connecting)
print(AbstractSocketTest.socket.sid)
waitForExpectationsWithTimeout(AbstractSocketTest.TEST_TIMEOUT, handler: nil) waitForExpectationsWithTimeout(AbstractSocketTest.TEST_TIMEOUT, handler: nil)
} }
@ -66,7 +66,6 @@ class AbstractSocketTest: XCTestCase {
if let expection = expection { if let expection = expection {
expection.fulfill() expection.fulfill()
} }
} }
AbstractSocketTest.socket.on(finalTestname + "Return", callback: didGetEmit) AbstractSocketTest.socket.on(finalTestname + "Return", callback: didGetEmit)

15
SocketIOClientSwift/SwiftRegex.swift
View File

@ -29,8 +29,8 @@ internal class SwiftRegex: NSObject, BooleanType {
NSRegularExpressionOptions.DotMatchesLineSeparators) NSRegularExpressionOptions.DotMatchesLineSeparators)
swiftRegexCache[pattern] = regex swiftRegexCache[pattern] = regex
self.regex = regex self.regex = regex
} catch let error1 as NSError { } catch let error as NSError {
SwiftRegex.failure("Error in pattern: \(pattern) - \(error1)") SwiftRegex.failure("Error in pattern: \(pattern) - \(error)")
self.regex = NSRegularExpression() self.regex = NSRegularExpression()
} }
} }
@ -46,7 +46,7 @@ internal class SwiftRegex: NSObject, BooleanType {
} }
private final func substring(range: NSRange) -> String? { private final func substring(range: NSRange) -> String? {
if ( range.location != NSNotFound ) { if range.location != NSNotFound {
return (target as NSString).substringWithRange(range) return (target as NSString).substringWithRange(range)
} else { } else {
return nil return nil
@ -70,8 +70,10 @@ internal class SwiftRegex: NSObject, BooleanType {
NSMatchingOptions.WithoutAnchoringBounds, range: targetRange)) NSMatchingOptions.WithoutAnchoringBounds, range: targetRange))
} }
private func groupsForMatch(match: NSTextCheckingResult!) -> [String]? { private func groupsForMatch(match: NSTextCheckingResult?) -> [String]? {
if match != nil { guard let match = match else {
return nil
}
var groups = [String]() var groups = [String]()
for groupno in 0...regex.numberOfCaptureGroups { for groupno in 0...regex.numberOfCaptureGroups {
if let group = substring(match.rangeAtIndex(groupno)) { if let group = substring(match.rangeAtIndex(groupno)) {
@ -81,9 +83,6 @@ internal class SwiftRegex: NSObject, BooleanType {
} }
} }
return groups return groups
} else {
return nil
}
} }
subscript(groupno: Int) -> String? { subscript(groupno: Int) -> String? {