Merge branch 'dev' of https://github.com/open-source-labs/Swell into dev

Author: sam-parsons

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Swell
+Copyright (c) 2018 Swell
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -20,12 +20,12 @@ Swell is currently available for OS X, Linux and Windows.
 ## Highlights
 Swell is a one-stop shop for sending and monitoring your API requests
 
-* Send and monitor requests over HTTP2 (including SSEs), WebSockets, and GraphQL
+* Send and monitor streams over HTTP2 (including SSEs) and WebSockets
+* Create GraphQL queries, mutations, and subscriptions
 * Support for up to six concurrent connections
 * View request/response timing information in an interactive chart
 * Save requests in "collections" of multiple requests
-* Minimize and maximize requests
-* Native OS/X app
+* Import and export "collections" for sharing
 
 ## Supported Technologies
 * *HTTP2*: Swell supports full HTTP2 multiplexing of requests and responses. HTTP requests to the same host will be sent over the same connection. Swell will attempt to initiate an HTTP2 connection for all HTTPS requests by default, but will revert to HTTP1.1 for legacy servers.
@@ -52,18 +52,17 @@ Swell is a one-stop shop for sending and monitoring your API requests
      style="float: left; margin-right: 10px; margin-bottom : 30px; margin-top : 10px; border: 1px solid black;" /></kbd>
 
 
-* *Minimize/Expand*: Swell allows you to minimize and expand your requests, making it easy to manage everything at once.
-<kbd><img src="./ReadMeGifs/Swell_API_Minimize_Expand.gif"
+* *Import/Export Collections*: Swell allows you to import and export collections, making it easy to share collections with your team.
+<kbd><img src="./ReadMeGifs/Swell_API_ImportExportCol.gif"
      style="float: left; margin-right: 10px; margin-bottom : 30px; margin-top : 10px; border: 1px solid black;" /></kbd>
 
 
 ## Built With
 * Electron
 * React
 * Redux
-* Express
-* Apollo
-* React-Modal
+* Apollo Client
+* Websockets
 * IndexedDB
 * Chart.js
 
@@ -78,6 +77,10 @@ Swell is a one-stop shop for sending and monitoring your API requests
 * **Abby Chao** - [abbychao](https://github.com/abbychao)
 * **Amanda Flink** - [aflinky](https://github.com/aflinky)
 * **Kajol Thapa** - [kajolthapa](https://github.com/kajolthapa)
+* **Anthony Toreson** - [atoreson](https://github.com/atoreson)
+* **Billy Tran** - [btctrl](https://github.com/btctrl)
+* **Paul Rhee** - [prheee](https://github.com/prheee)
+* **Sam Parsons** - [sam-parsons](https://github.com/sam-parsons)
 
 ## License
 

ReadMeGifs/Swell_API_ImportExportCol.gif

@@ -11,9 +11,9 @@ describe('Business reducer', () => {
       collections: [],
       warningMessage: "",
       newRequestFields: {
-        method: 'GET',
         protocol: '',
         url: 'http://',
+        method: 'GET',
         graphQL: false
       },
       newRequestHeaders: {
@@ -26,11 +26,14 @@ describe('Business reducer', () => {
       },
       newRequestBody: {
         bodyContent: '',
+        bodyVariables: '',
         bodyType: 'none',
         rawType: 'Text (text/plain)',
         JSONFormatted: true,
-        bodyVariables: ''
       },
+      newRequestSSE: {
+        isSSE: false
+      }
     };
   })
 

ReadMeGifs/Swell_API_Minimize_Expand.gif

@@ -82,37 +82,49 @@ describe('ResponseEventsDisplay', () => {
 describe('ResponseSubscriptionDisplay', () => {
   let props;
   let wrapper;
-  const testURL = 'https://swell-test-graphql.herokuapp.com';
+  const testURL = 'ws://localhost:4000/';
   beforeAll(() => {
     props = {
       content: {
         url: testURL,
-        protocol: 'https://',
+        protocol: 'ws://',
         connection: 'open',
         request: {
-          body: `subscription {
-            newLink {
+          body: `subscription MessageSentSubscription {
+            messageSent {
               id
-              url
-              description
-              postedBy {
-                id
-                name
-                email
-              }
+              from
+              message
             }
           }`,
+          bodyVariables: '',
         },
         response: {
           events: [],
         }
       },
       reqResUpdate: jest.fn(),
     };
-    wrapper = renderer.create(<ResponseSubscriptionDisplay {...props} />);
+    wrapper = shallow(<ResponseSubscriptionDisplay {...props}/>)
 
   });
-  xit('should initialize as listening', () => {
-    expect(wrapper).toMatchSnapshot();
+  it('should initialize as listening', () => {
+    expect(wrapper.text()).toEqual('');
+  });
+
+  it('should have one event displayed', () => {
+    
+    // reassign props with one event
+    props.content.response.event =
+            {
+              "messageSent": {
+                  "id": 34,
+                  "from": "sam",
+                  "message": "rock and roll",
+                  "__typename": "Chat"
+              }
+          }
+    // expect one json response to be found
+    expect(wrapper.find('div.json-response')).toHaveLength(1);
   });
 });

__tests__/businessReducer.js

@@ -1,6 +1,6 @@
 {
   "name": "Swell",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Swell",
   "main": "main.js",
   "repository": "https://github.com/open-source-labs/Swell",
@@ -61,7 +61,27 @@
       "name": "Amanda Flink",
       "email": "[email protected]",
       "url": "https://github.com/aflinky"
-    }
+    },
+    {
+      "name": "Anthony Toreson",
+      "email": "[email protected]",
+      "url": "https://github.com/atoreson"
+    },
+    {
+      "name": "Billy Tran",
+      "email": "[email protected]",
+      "url": "https://github.com/btctrl"
+    },
+    {
+      "name": "Paul Rhee",
+      "email": "[email protected]",
+      "url": "https://github.com/prheee"
+    },
+    {
+      "name": "Sam Parsons",
+      "email": "[email protected]",
+      "url": "https://github.com/sam-parsons"
+    },
   ],
   "build": {
     "productName": "Swell",