Support fresh story_with_config

esl · Mar 9, 2016 · b47159c · b47159c
1 parent 3e48877
commit b47159c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/include/escalus.hrl b/include/escalus.hrl
@@ -28,6 +28,5 @@
         compress :: {zlib, {Zin::zlib:zstream(), Zout::zlib:zstream()}}
                  |  false,
         rcv_pid :: pid(),
-        event_client :: any(),
-        user_spec = [] :: proplists:proplist()
+        event_client :: any()
        }).
diff --git a/src/escalus.erl b/src/escalus.erl
@@ -30,6 +30,7 @@
          override/3,
          make_everyone_friends/1,
          fresh_story/3,
+         fresh_story_with_config/3,
          story/3,
          assert/2,
          assert/3,
@@ -98,6 +99,7 @@ end_per_testcase(_CaseName, Config) ->
 ?FORWARD3(escalus_story, story).
 
 ?FORWARD3_AS(escalus_fresh, story, fresh_story).
+?FORWARD3_AS(escalus_fresh, story_with_config, fresh_story_with_config).
 
 ?FORWARD2(escalus_new_assert, assert).
 ?FORWARD3(escalus_new_assert, assert).

diff --git a/src/escalus_client.erl b/src/escalus_client.erl
@@ -31,8 +31,7 @@
          short_jid/1,
          username/1,
          server/1,
-         resource/1,
-         spec/1
+         resource/1
         ]).
 
 -import(escalus_compat, [bin/1, unimplemented/0]).
@@ -54,7 +53,7 @@ start(Config, UserSpec, Resource) ->
     case escalus_connection:start(Options) of
         {ok, Conn, Props, _} ->
             Jid = make_jid(Props),
-            Client = Conn#client{jid = Jid, event_client = EventClient, user_spec = UserSpec},
+            Client = Conn#client{jid = Jid, event_client = EventClient},
             escalus_cleaner:add_client(Config, Client),
             {ok, Client};
         {error, Error} ->
@@ -146,9 +145,6 @@ server(Client) ->
 resource(Client) ->
     escalus_utils:regexp_get(full_jid(Client), <<"^[^/]*[/](.*)">>).
 
-spec(#client{user_spec = US}) ->
-    US.
-
 %%--------------------------------------------------------------------
 %% helpers
 %%--------------------------------------------------------------------

diff --git a/src/escalus_fresh.erl b/src/escalus_fresh.erl
@@ -1,5 +1,13 @@
 -module(escalus_fresh).
--export([story/3]).
+-export([story/3, story_with_config/3]).
+
+story_with_config(Config, UserSpecs, StoryFun) ->
+    FreshSpecs = fresh_specs(Config, UserSpecs, fresh_suffix()),
+    case length(FreshSpecs) == length(UserSpecs) of
+        false -> ct:fail("failed to get required users"); _ -> ok end,
+    FreshConfig = escalus_users:create_users(Config, FreshSpecs),
+    escalus:story(FreshConfig, UserSpecs, 
+                  fun(Args) -> apply(StoryFun, [FreshConfig|Args]) end).
 
 story(Config, UserSpecs, StoryFun) ->
     FreshSpecs = fresh_specs(Config, UserSpecs, fresh_suffix()),