Merge pull request TooTallNate#446 from marci4/master

Updated pom

Author: marci4

pom.xml

@@ -21,7 +21,7 @@
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <java.version>1.6</java.version>
- <cucumber.version>1.0.0.RC24</cucumber.version>
+ <cucumber.version>1.0.2</cucumber.version>
  </properties>
  <build>
  <plugins>
@@ -67,14 +67,14 @@
  <dependency>
  <groupId>junit</groupId>
  <artifactId>junit</artifactId>
- <version>4.8.2</version>
+ <version>4.10</version>
  <scope>test</scope>
  </dependency>
 <!-- Cucumber -->
  <dependency>
  <groupId>info.cukes</groupId>
  <artifactId>cucumber-junit</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2</version>
  <scope>test</scope>
  </dependency>
  <dependency>
@@ -125,26 +125,7 @@
  <activation> 
  <property><name>performRelease</name><value>true</value></property> 
  </activation> 
- <build> 
- <plugins> 
- <plugin> 
- <groupId>org.apache.maven.plugins</groupId> 
- <artifactId>maven-gpg-plugin</artifactId> 
- <version>1.1</version> 
- <executions> 
- <execution> 
- <id>sign-artifacts</id> 
- <phase>verify</phase> 
- <goals> 
- <goal>sign</goal> 
- </goals> 
- </execution> 
- </executions> 
- <configuration> 
- <keyname>[email protected]</keyname>
- </configuration> 
- </plugin> 
- </plugins> 
+ <build>
  </build> 
  </profile> 
  </profiles> 

src/test/resources/org/java_websocket/AutobahnClient.feature

@@ -1,25 +1,26 @@
 Feature: Client connects using Draft 17
-As an autobahn client
-I want to connect to a websocket server using draft 17
-So that I can send and receive messages
+As an autobahn client
+I want to connect to a websocket server using draft 17
+So that I can send and receive messages
 
-Scenario Outline: Client connection parameters are valid
-Given the Autobahn Server is running using Draft_<draft> on port <port>
-And protocol is <protocol>
-And the host is <host>
-And the port is <port>
-And the query string is <query>
-And the draft is Draft_<draft>
-When the client connects to the server
-Then the server response should contain <method>
-And the response's query should contain <query>
-And the response's http version should contain <http_version>
-And the response's handshake should contain <handshake>
-And the response's host should contain <host>
-And the response's websocket key should contain <websocket_key>
-And the response's websocket version should contain <websocket_version>
-And the response's upgraded protocol should contain <upgraded_protocol>
+Scenario Outline: Client connection parameters are valid
+Given the Autobahn Server is running using Draft_<draft> on port <port>
+And protocol is <protocol>
+And the host is <host>
+And the port is <port>
+And the path is <path>
+And the query string is <query>
+And the draft is Draft_<draft>
+When the client connects to the server
+Then the server response should contain <method>
+And the response's query should contain <query>
+And the response's http version should contain <http_version>
+And the response's handshake should contain <handshake>
+And the response's host should contain <host>
+And the response's websocket key should contain <websocket_key>
+And the response's websocket version should contain <websocket_version>
+And the response's upgraded protocol should contain <upgraded_protocol>
 
-Examples:
-| protocol | host | port | query | draft | method | http_version | handshake | websocket_key | websocket_version | upgraded_protocol |
-| ws | localhost | 9003 | case=1&agent=tootallnate/websocket | 17 | GET | HTTP/1.1 | Upgrade | Sec-WebSocket-Key | Sec-WebSocket-Version | websocket |
+Examples:
+| protocol | host | port | path | query | draft | method | http_version | handshake | websocket_key | websocket_version | upgraded_protocol |
+| ws | localhost | 9003 | /websocket | case=1&agent=tootallnate/websocket | 17 | GET | HTTP/1.1 | Upgrade | Sec-WebSocket-Key | Sec-WebSocket-Version | websocket |