kenan-rhoton · kenan-rhoton · Sep 1, 2018 · Aug 31, 2018 · Aug 31, 2018 · Aug 31, 2018
diff --git a/backend/old_tests/api/base_test.clj b/backend/old_tests/api/base_test.clj
diff --git a/backend/old_tests/api/newgame_test.clj b/backend/old_tests/api/newgame_test.clj
diff --git a/backend/old_tests/mocking.clj b/backend/old_tests/mocking.clj
diff --git a/backend/src/rules/count_cards.clj b/backend/src/rules/count_cards.clj
@@ -1,7 +1,7 @@
 (ns rules.count-cards)
 
 (defn count-cards
-  "Count all cards that has keys as in condition an sums their summand"
+  "Count (or sums the summands of) all cards that have keys as in condition "
   [game-state condition & summand]
   (let [k (vec (keys condition))
         summand (first summand)]

diff --git a/backend/test/api/join_game_test.clj → backend/test/api/base_test.clj b/backend/test/api/join_game_test.clj → backend/test/api/base_test.clj
@@ -1,4 +1,4 @@
-(ns api.join-game-test
+(ns api.base-test
   (:require [expectations.clojure.test :refer :all]
             [clojure.test :as ctest]
             [mocking :as mocking]
@@ -8,6 +8,12 @@
 
 (ctest/use-fixtures :each mocking/mock-persistence)
 
+(defexpect game-creation
+  (expect 0 (:game-id (base/create-game)))
+  (expect messages/no-opp (:status (base/create-game)))
+  (expect nil (:player-ids (base/create-game)))
+  (expect true (contains? (base/create-game) :player-id)))
+
 (defexpect join-game
 
   (let [joined-game (-> (base/create-game) :game-id base/add-player)]

diff --git a/backend/test/api/create_game_test.clj b/backend/test/api/create_game_test.clj