Merge branch 'sk-test-suite' of https://github.com/realm/realm-js into sk-test-suite

This commit is contained in:
Ari Lazier 2015-10-16 10:35:41 -07:00
commit 430b2a29e5
5 changed files with 39 additions and 1 deletions

View File

@ -65,6 +65,13 @@ JSGlobalContextRef RealmReactGetJSGlobalContextForExecutor(id executor) {
id executor = object_getIvar(bridge, executorIvar);
Ivar contextIvar = class_getInstanceVariable([executor class], "_context");
static GCDWebServer *s_webServer;
if (s_webServer) {
[s_webServer stop];
[s_webServer removeAllHandlers];
s_webServer = nil;
}
// The executor could be a RCTWebSocketExecutor, in which case it won't have a JS context.
if (!contextIvar) {
[GCDWebServer setLogLevel:3];
@ -90,9 +97,11 @@ JSGlobalContextRef RealmReactGetJSGlobalContextForExecutor(id executor) {
[response setValue:@"http://localhost:8081" forAdditionalHeader:@"Access-Control-Allow-Origin"];
return response;
}];
}];
[webServer startWithPort:8082 bonjourName:nil];
s_webServer = webServer;
return;
}

View File

@ -31,3 +31,4 @@ realm::Schema RJSParseSchema(JSContextRef ctx, JSObjectRef jsonObject);
JSValueRef RJSPrototypeForClassName(const std::string &className);
realm::ObjectDefaults &RJSDefaultsForClassName(const std::string &className);
void RJSSchemaClearState(JSContextRef ctx);

View File

@ -55,6 +55,20 @@ JSValueRef RJSPrototypeForClassName(const std::string &className) {
return s_prototypes[className];
}
void RJSSchemaClearState(JSContextRef ctx) {
for (auto prototype : s_prototypes) {
JSValueUnprotect(ctx, prototype.second);
}
s_prototypes.clear();
for (auto defaults : s_defaults) {
for (auto value : defaults.second) {
JSValueUnprotect(ctx, value.second);
}
}
s_defaults.clear();
}
static inline Property RJSParseProperty(JSContextRef ctx, JSObjectRef propertyObject) {
static JSStringRef nameString = JSStringCreateWithUTF8CString("name");
static JSStringRef typeString = JSStringCreateWithUTF8CString("type");

View File

@ -20,6 +20,7 @@
#import "RJSRealm.hpp"
#import "RJSObject.hpp"
#import "RJSUtil.hpp"
#import "RJSSchema.hpp"
#include "shared_realm.hpp"
@ -57,6 +58,7 @@ NSString *RealmFileDirectory() {
static JSValueRef ClearTestState(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception) {
[RealmJS clearTestState];
RJSSchemaClearState(ctx);
return NULL;
}

View File

@ -41,11 +41,23 @@ using RPCRequest = std::function<NSDictionary *(NSDictionary *dictionary)>;
std::map<RPCObjectID, JSObjectRef> _objects;
}
- (void)dealloc {
for (auto item : _objects) {
JSValueUnprotect(_context, item.second);
}
JSGlobalContextRelease(_context);
_requests.clear();
}
- (instancetype)init {
self = [super init];
if (self) {
_context = JSGlobalContextCreate(NULL);
id _self = self;
__weak __typeof__(self) self = _self;
_requests["/create_realm"] = [=](NSDictionary *dict) {
NSArray *args = dict[@"arguments"];
NSUInteger argCount = args.count;