integration: merge version-and-commits and main into cli.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>

test/integration/cli.bats

@@ -2,6 +2,11 @@
 
 load helpers
 
+@test "create doesn't accept any arugments" {
+	run swarm create derpderpderp
+	[ "$status" -ne 0 ]
+}
+
 @test "version string should contain a proper number with git commit" {
 	run swarm -v
 

test/integration/main.bats

@@ -1,9 +0,0 @@
-#!/usr/bin/env bats
-
-load helpers
-
-@test "test that create doesn't accept any arugments" {
-	run swarm create derpderpderp
-	[ "$status" -ne 0 ]
-}
-