Skip to content

Commit

Permalink
ci(Semantic release): Sync master into beta [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
Zino App (Github bot) committed May 29, 2019
2 parents 4832cbc + 0c176ad commit b490c20
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 14 deletions.
28 changes: 14 additions & 14 deletions packages/graphql/lib/src/websocket/messages.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class MessageTypes {
}

abstract class JsonSerializable {
dynamic toJson();
Map<String, dynamic> toJson();

@override
String toString() => toJson().toString();
Expand All @@ -55,7 +55,7 @@ class InitOperation extends GraphQLSocketMessage {
final dynamic payload;

@override
dynamic toJson() {
Map<String, dynamic> toJson() {
final Map<String, dynamic> jsonMap = <String, dynamic>{};
jsonMap['type'] = type;

Expand All @@ -76,15 +76,15 @@ class LegacyInitOperation extends InitOperation {
LegacyInitOperation(dynamic payload) : super(payload);

@override
dynamic toJson() {
Map<String, dynamic> toJson() {
final Map<String, dynamic> jsonMap = <String, dynamic>{};
jsonMap['type'] = type;

if (payload != null) {
jsonMap['payload'] = json.encode(payload);
}

return json.encode(jsonMap);
return jsonMap;
}
}

Expand All @@ -97,7 +97,7 @@ class SubscriptionRequest extends JsonSerializable {
final Operation operation;

@override
dynamic toJson() => <String, dynamic>{
Map<String, dynamic> toJson() => <String, dynamic>{
'operationName': operation.operationName,
'query': operation.document,
'variables': operation.variables,
Expand All @@ -116,7 +116,7 @@ class StartOperation extends GraphQLSocketMessage {
final SubscriptionRequest payload;

@override
dynamic toJson() => <String, dynamic>{
Map<String, dynamic> toJson() => <String, dynamic>{
'type': type,
'id': id,
'payload': payload,
Expand All @@ -131,7 +131,7 @@ class StopOperation extends GraphQLSocketMessage {
final String id;

@override
dynamic toJson() => <String, dynamic>{
Map<String, dynamic> toJson() => <String, dynamic>{
'type': type,
'id': id,
};
Expand All @@ -143,7 +143,7 @@ class ConnectionAck extends GraphQLSocketMessage {
ConnectionAck() : super(MessageTypes.GQL_CONNECTION_ACK);

@override
dynamic toJson() => <String, dynamic>{
Map<String, dynamic> toJson() => <String, dynamic>{
'type': type,
};
}
Expand All @@ -156,7 +156,7 @@ class ConnectionError extends GraphQLSocketMessage {
final dynamic payload;

@override
dynamic toJson() => <String, dynamic>{
Map<String, dynamic> toJson() => <String, dynamic>{
'type': type,
'payload': payload,
};
Expand All @@ -167,7 +167,7 @@ class ConnectionKeepAlive extends GraphQLSocketMessage {
ConnectionKeepAlive() : super(MessageTypes.GQL_CONNECTION_KEEP_ALIVE);

@override
dynamic toJson() => <String, dynamic>{
Map<String, dynamic> toJson() => <String, dynamic>{
'type': type,
};
}
Expand All @@ -184,7 +184,7 @@ class SubscriptionData extends GraphQLSocketMessage {
final dynamic errors;

@override
dynamic toJson() => <String, dynamic>{
Map<String, dynamic> toJson() => <String, dynamic>{
'type': type,
'data': data,
'errors': errors,
Expand All @@ -200,7 +200,7 @@ class SubscriptionError extends GraphQLSocketMessage {
final dynamic payload;

@override
dynamic toJson() => <String, dynamic>{
Map<String, dynamic> toJson() => <String, dynamic>{
'type': type,
'id': id,
'payload': payload,
Expand All @@ -215,7 +215,7 @@ class SubscriptionComplete extends GraphQLSocketMessage {
final String id;

@override
dynamic toJson() => <String, dynamic>{
Map<String, dynamic> toJson() => <String, dynamic>{
'type': type,
'id': id,
};
Expand All @@ -230,7 +230,7 @@ class UnknownData extends GraphQLSocketMessage {
final dynamic payload;

@override
dynamic toJson() => <String, dynamic>{
Map<String, dynamic> toJson() => <String, dynamic>{
'type': type,
'payload': payload,
};
Expand Down
68 changes: 68 additions & 0 deletions packages/graphql/test/websocket_test.dart
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import 'package:test/test.dart';
import 'package:graphql/src/websocket/messages.dart'
show
// ignore: deprecated_member_use_from_same_package
LegacyInitOperation,
InitOperation;

void main() {
group('LegacyInitOperation', () {
test('null payload', () {
// ignore: deprecated_member_use_from_same_package
final operation = LegacyInitOperation(null);
expect(operation.toJson(), {'type': 'connection_init'});
});
test('simple payload', () {
// ignore: deprecated_member_use_from_same_package
final operation = LegacyInitOperation(42);
expect(operation.toJson(), {'type': 'connection_init', 'payload': '42'});
});
test('complex payload', () {
// ignore: deprecated_member_use_from_same_package
final operation = LegacyInitOperation({
'value': 42,
'nested': {
'number': [3, 7],
'string': ['foo', 'bar']
}
});
expect(operation.toJson(), {
'type': 'connection_init',
'payload':
'{"value":42,"nested":{"number":[3,7],"string":["foo","bar"]}}'
});
});
});
group('InitOperation', () {
test('null payload', () {
// ignore: deprecated_member_use_from_same_package
final operation = InitOperation(null);
expect(operation.toJson(), {'type': 'connection_init'});
});
test('simple payload', () {
// ignore: deprecated_member_use_from_same_package
final operation = InitOperation(42);
expect(operation.toJson(), {'type': 'connection_init', 'payload': 42});
});
test('complex payload', () {
// ignore: deprecated_member_use_from_same_package
final operation = InitOperation({
'value': 42,
'nested': {
'number': [3, 7],
'string': ['foo', 'bar']
}
});
expect(operation.toJson(), {
'type': 'connection_init',
'payload': {
'value': 42,
'nested': {
'number': [3, 7],
'string': ['foo', 'bar']
}
}
});
});
});
}

0 comments on commit b490c20

Please sign in to comment.