From 3234b71b5bc152504a2879793bc59580d45fb5b7 Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Mon, 31 Aug 2015 21:07:25 +0200 Subject: [PATCH 1/9] travis support --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..704d2a1 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: objective-c +xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder +xcode_scheme: SocketIO-iOSTests +osx_image: xcode7 \ No newline at end of file From 39a7a4f337396a78f232cd73b14f071ded551371 Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Mon, 31 Aug 2015 22:18:35 +0200 Subject: [PATCH 2/9] correct scheme --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 704d2a1..f595ad1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: objective-c xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder -xcode_scheme: SocketIO-iOSTests +xcode_scheme: SocketIO-iOS osx_image: xcode7 \ No newline at end of file From e19a28684b7582e24c3a22dfd5744a7c06d54cbd Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Mon, 31 Aug 2015 22:27:01 +0200 Subject: [PATCH 3/9] code signing --- Socket.IO-Client-Swift.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj index 73cd272..3315a7a 100644 --- a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj +++ b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj @@ -535,6 +535,7 @@ 572EF2121B51F12F00EEBB58 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "Developer ID Application"; GCC_OPTIMIZATION_LEVEL = 0; PRODUCT_NAME = SocketIO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -544,6 +545,7 @@ 572EF2131B51F12F00EEBB58 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "Developer ID Application"; PRODUCT_NAME = SocketIO; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; }; From f3ed05e9705b91a0f196e7ce098fdc7c42a0075b Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Mon, 31 Aug 2015 22:32:01 +0200 Subject: [PATCH 4/9] turn of code signing --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f595ad1..1f45e91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ language: objective-c xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder xcode_scheme: SocketIO-iOS -osx_image: xcode7 \ No newline at end of file +osx_image: xcode7 +script: + - xcodebuild [DEFAULT_OPTIONS] CODE_SIGNING_REQUIRED=NO \ No newline at end of file From 672e3601ed5cbe2d384265a7a40d19090808fc19 Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Mon, 31 Aug 2015 22:39:16 +0200 Subject: [PATCH 5/9] next signing tests --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f45e91..7d5c9b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,4 @@ language: objective-c xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder xcode_scheme: SocketIO-iOS osx_image: xcode7 -script: - - xcodebuild [DEFAULT_OPTIONS] CODE_SIGNING_REQUIRED=NO \ No newline at end of file +script: xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-iOS build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO \ No newline at end of file From cd2ee8950f0a8084bc9b7bc963e37c277cf905c4 Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Mon, 31 Aug 2015 22:56:52 +0200 Subject: [PATCH 6/9] running tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7d5c9b0..e34447a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ language: objective-c xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder xcode_scheme: SocketIO-iOS osx_image: xcode7 -script: xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-iOS build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO \ No newline at end of file +script: xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-iOS test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO \ No newline at end of file From 5471411f74202e870b56ece7fe9f56fd70b43495 Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Mon, 31 Aug 2015 23:35:31 +0200 Subject: [PATCH 7/9] use xcodebuild --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e34447a..f648335 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ language: objective-c xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder xcode_scheme: SocketIO-iOS osx_image: xcode7 -script: xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-iOS test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO \ No newline at end of file +script: xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-iOS test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO \ No newline at end of file From 1777d490c53c5e9db9e5d704c123dc0e3127ff0c Mon Sep 17 00:00:00 2001 From: Lukas Schmidt Date: Mon, 31 Aug 2015 23:38:44 +0200 Subject: [PATCH 8/9] test --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f648335..1e0cb54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ language: objective-c xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder xcode_scheme: SocketIO-iOS osx_image: xcode7 -script: xcodebuild -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-iOS test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO \ No newline at end of file +script: xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-iOS -sdk iphonesimulator build test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO \ No newline at end of file From adf8536c0c668099a58de0e63204b99349ee6379 Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 2 Sep 2015 12:02:02 -0400 Subject: [PATCH 9/9] point to test server --- Socket.IO-Test-Server/main.js | 2 +- SocketIO-iOSTests/SocketAcknowledgementTest.swift | 2 +- SocketIO-iOSTests/SocketEmitTest.swift | 2 +- SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift | 2 +- SocketIO-iOSTests/SocketNamespaceEmitTest.swift | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Socket.IO-Test-Server/main.js b/Socket.IO-Test-Server/main.js index ae83f97..fb4a05d 100644 --- a/Socket.IO-Test-Server/main.js +++ b/Socket.IO-Test-Server/main.js @@ -1,5 +1,5 @@ var app = require('express')() -var server = app.listen(8080) +var server = app.listen(6979) var io = require('socket.io')(server) var acknowledgementsEvents = require("./acknowledgementEvents.js") var emitEvents = require("./emitEvents.js") diff --git a/SocketIO-iOSTests/SocketAcknowledgementTest.swift b/SocketIO-iOSTests/SocketAcknowledgementTest.swift index 801e852..313c372 100644 --- a/SocketIO-iOSTests/SocketAcknowledgementTest.swift +++ b/SocketIO-iOSTests/SocketAcknowledgementTest.swift @@ -13,7 +13,7 @@ class SocketAcknowledgementTest: AbstractSocketTest { override func setUp() { super.setUp() testKind = TestKind.Acknowledgement - socket = SocketIOClient(socketURL: "127.0.0.1:8080", opts: [ + socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [ "reconnects": true, // default true "reconnectAttempts": -1, // default -1 "reconnectWait": 5, // default 10 diff --git a/SocketIO-iOSTests/SocketEmitTest.swift b/SocketIO-iOSTests/SocketEmitTest.swift index a970444..56eaf53 100644 --- a/SocketIO-iOSTests/SocketEmitTest.swift +++ b/SocketIO-iOSTests/SocketEmitTest.swift @@ -13,7 +13,7 @@ class SocketEmitTest: AbstractSocketTest { override func setUp() { super.setUp() testKind = TestKind.Emit - socket = SocketIOClient(socketURL: "127.0.0.1:8080", opts: [ + socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [ "reconnects": true, // default true "reconnectAttempts": -1, // default -1 "reconnectWait": 5, // default 10 diff --git a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift index d25fecf..ca68288 100644 --- a/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift +++ b/SocketIO-iOSTests/SocketNamespaceAcknowledgementTest.swift @@ -13,7 +13,7 @@ class SocketNamespaceAcknowledgementTest: AbstractSocketTest { override func setUp() { super.setUp() testKind = TestKind.Acknowledgement - socket = SocketIOClient(socketURL: "127.0.0.1:8080", opts: [ + socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [ "reconnects": true, // default true "reconnectAttempts": -1, // default -1 "reconnectWait": 5, // default 10 diff --git a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift index 057fcc1..c83a4ba 100644 --- a/SocketIO-iOSTests/SocketNamespaceEmitTest.swift +++ b/SocketIO-iOSTests/SocketNamespaceEmitTest.swift @@ -13,7 +13,7 @@ class SocketNamespaceEmitTest: AbstractSocketTest { override func setUp() { super.setUp() testKind = TestKind.Emit - socket = SocketIOClient(socketURL: "127.0.0.1:8080", opts: [ + socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [ "reconnects": true, // default true "reconnectAttempts": -1, // default -1 "reconnectWait": 5, // default 10