diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/mock_pkg_resource.erl | 2 | ||||
-rw-r--r-- | test/rebar_dir_SUITE.erl | 42 | ||||
-rw-r--r-- | test/rebar_hooks_SUITE.erl | 22 | ||||
-rw-r--r-- | test/rebar_plugins_SUITE.erl | 9 | ||||
-rw-r--r-- | test/rebar_profiles_SUITE.erl | 3 | ||||
-rw-r--r-- | test/rebar_src_dirs_SUITE.erl | 12 |
6 files changed, 55 insertions, 35 deletions
diff --git a/test/mock_pkg_resource.erl b/test/mock_pkg_resource.erl index 4ed8d8e..a94fe2f 100644 --- a/test/mock_pkg_resource.erl +++ b/test/mock_pkg_resource.erl @@ -117,7 +117,7 @@ mock_pkg_index(Opts) -> meck:new(rebar_packages, [passthrough, no_link]), meck:expect(rebar_packages, packages, fun(_State) -> to_index(Deps, Dict) end), - meck:expect(rebar_packages, load_and_verify_version, + meck:expect(rebar_packages, verify_table, fun(_State) -> to_index(Deps, Dict), true end). %%%%%%%%%%%%%%% diff --git a/test/rebar_dir_SUITE.erl b/test/rebar_dir_SUITE.erl index a3c5052..6fbc081 100644 --- a/test/rebar_dir_SUITE.erl +++ b/test/rebar_dir_SUITE.erl @@ -28,39 +28,39 @@ end_per_testcase(_, _Config) -> ok. default_src_dirs(Config) -> {ok, State} = rebar_test_utils:run_and_check(Config, [], ["compile"], return), - - [] = rebar_dir:src_dirs(State), - ["src"] = rebar_dir:src_dirs(State, ["src"]). + + [] = rebar_dir:src_dirs(rebar_state:opts(State)), + ["src"] = rebar_dir:src_dirs(rebar_state:opts(State), ["src"]). default_extra_src_dirs(Config) -> {ok, State} = rebar_test_utils:run_and_check(Config, [], ["compile"], return), - - [] = rebar_dir:extra_src_dirs(State), - ["src"] = rebar_dir:extra_src_dirs(State, ["src"]). + + [] = rebar_dir:extra_src_dirs(rebar_state:opts(State)), + ["src"] = rebar_dir:extra_src_dirs(rebar_state:opts(State), ["src"]). default_all_src_dirs(Config) -> {ok, State} = rebar_test_utils:run_and_check(Config, [], ["compile"], return), - - [] = rebar_dir:all_src_dirs(State), - ["src", "test"] = rebar_dir:all_src_dirs(State, ["src"], ["test"]). + + [] = rebar_dir:all_src_dirs(rebar_state:opts(State)), + ["src", "test"] = rebar_dir:all_src_dirs(rebar_state:opts(State), ["src"], ["test"]). src_dirs(Config) -> RebarConfig = [{erl_opts, [{src_dirs, ["foo", "bar", "baz"]}]}], {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return), - - ["foo", "bar", "baz"] = rebar_dir:src_dirs(State). + + ["foo", "bar", "baz"] = rebar_dir:src_dirs(rebar_state:opts(State)). extra_src_dirs(Config) -> RebarConfig = [{erl_opts, [{extra_src_dirs, ["foo", "bar", "baz"]}]}], {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return), - - ["foo", "bar", "baz"] = rebar_dir:extra_src_dirs(State). + + ["foo", "bar", "baz"] = rebar_dir:extra_src_dirs(rebar_state:opts(State)). all_src_dirs(Config) -> RebarConfig = [{erl_opts, [{src_dirs, ["foo", "bar"]}, {extra_src_dirs, ["baz", "qux"]}]}], {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return), - - ["foo", "bar", "baz", "qux"] = rebar_dir:all_src_dirs(State). + + ["foo", "bar", "baz", "qux"] = rebar_dir:all_src_dirs(rebar_state:opts(State)). profile_src_dirs(Config) -> RebarConfig = [ @@ -70,9 +70,9 @@ profile_src_dirs(Config) -> ]} ], {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["as", "more", "compile"], return), - + R = lists:sort(["foo", "bar", "baz", "qux"]), - R = lists:sort(rebar_dir:src_dirs(State)). + R = lists:sort(rebar_dir:src_dirs(rebar_state:opts(State))). profile_extra_src_dirs(Config) -> RebarConfig = [ @@ -82,9 +82,9 @@ profile_extra_src_dirs(Config) -> ]} ], {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["as", "more", "compile"], return), - + R = lists:sort(["foo", "bar", "baz", "qux"]), - R = lists:sort(rebar_dir:extra_src_dirs(State)). + R = lists:sort(rebar_dir:extra_src_dirs(rebar_state:opts(State))). profile_all_src_dirs(Config) -> RebarConfig = [ @@ -94,6 +94,6 @@ profile_all_src_dirs(Config) -> ]} ], {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["as", "more", "compile"], return), - + R = lists:sort(["foo", "bar", "baz", "qux"]), - R = lists:sort(rebar_dir:all_src_dirs(State)). + R = lists:sort(rebar_dir:all_src_dirs(rebar_state:opts(State))). diff --git a/test/rebar_hooks_SUITE.erl b/test/rebar_hooks_SUITE.erl index 85ca0e5..188fb34 100644 --- a/test/rebar_hooks_SUITE.erl +++ b/test/rebar_hooks_SUITE.erl @@ -43,7 +43,12 @@ build_and_clean_app(Config) -> Vsn = rebar_test_utils:create_random_vsn(), rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]), rebar_test_utils:run_and_check(Config, [], ["compile"], {ok, [{app, Name, valid}]}), - rebar_test_utils:run_and_check(Config, [{provider_hooks, [{post, [{compile, clean}]}]}], + RConfFile = + rebar_test_utils:create_config(AppDir, + [{provider_hooks, [{post, [{compile, clean}]}]}]), + {ok, RConf} = file:consult(RConfFile), + + rebar_test_utils:run_and_check(Config, RConf, ["compile"], {ok, [{app, Name, invalid}]}). escriptize_artifacts(Config) -> @@ -53,7 +58,7 @@ escriptize_artifacts(Config) -> Vsn = rebar_test_utils:create_random_vsn(), rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]), - Artifact = "bin/"++Name, + Artifact = "{{profile_dir}}/bin/"++Name, RConfFile = rebar_test_utils:create_config(AppDir, [ @@ -69,9 +74,18 @@ escriptize_artifacts(Config) -> {missing_artifact, Artifact}}} -> ok end, - rebar_test_utils:run_and_check(Config, RConf++[{provider_hooks, [{post, [{compile, escriptize}]}]}], + RConfFile1 = + rebar_test_utils:create_config(AppDir, + [ + {escript_name, list_to_atom(Name)} + ,{artifacts, [Artifact]} + ,{provider_hooks, [{post, [{compile, escriptize}]}]} + ]), + {ok, RConf1} = file:consult(RConfFile1), + + rebar_test_utils:run_and_check(Config, RConf1, ["compile"], {ok, [{app, Name, valid} - ,{file, filename:join([AppDir, "_build/default/", Artifact])}]}). + ,{file, filename:join([AppDir, "_build/default/bin", Name])}]}). run_hooks_once(Config) -> AppDir = ?config(apps, Config), diff --git a/test/rebar_plugins_SUITE.erl b/test/rebar_plugins_SUITE.erl index 5e2c782..3df3c0e 100644 --- a/test/rebar_plugins_SUITE.erl +++ b/test/rebar_plugins_SUITE.erl @@ -9,6 +9,7 @@ compile_plugins/1, compile_global_plugins/1, complex_plugins/1, + list/1, upgrade/1]). -include_lib("common_test/include/ct.hrl"). @@ -31,7 +32,7 @@ end_per_testcase(_, _Config) -> catch meck:unload(). all() -> - [compile_plugins, compile_global_plugins, complex_plugins, upgrade]. + [compile_plugins, compile_global_plugins, complex_plugins, list, upgrade]. %% Tests that compiling a project installs and compiles the plugins of deps compile_plugins(Config) -> @@ -163,6 +164,12 @@ complex_plugins(Config) -> meck:unload(rebar_dir). +list(Config) -> + rebar_test_utils:run_and_check( + Config, [], ["plugins", "list"], + {ok, []} + ). + upgrade(Config) -> AppDir = ?config(apps, Config), diff --git a/test/rebar_profiles_SUITE.erl b/test/rebar_profiles_SUITE.erl index 41bb535..d4c10c5 100644 --- a/test/rebar_profiles_SUITE.erl +++ b/test/rebar_profiles_SUITE.erl @@ -428,8 +428,7 @@ test_profile_applied_to_apps(Config) -> Apps = rebar_state:project_apps(State), lists:foreach(fun(App) -> - AppState = rebar_app_info:state(App), - Opts = rebar_state:opts(AppState), + Opts = rebar_app_info:opts(App), ErlOpts = dict:fetch(erl_opts, Opts), true = lists:member({d, 'TEST'}, ErlOpts) end, Apps). diff --git a/test/rebar_src_dirs_SUITE.erl b/test/rebar_src_dirs_SUITE.erl index e322190..e29dcf0 100644 --- a/test/rebar_src_dirs_SUITE.erl +++ b/test/rebar_src_dirs_SUITE.erl @@ -49,7 +49,7 @@ src_dirs_at_root(Config) -> {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return), - ["foo", "bar", "baz"] = rebar_dir:src_dirs(State, []). + ["foo", "bar", "baz"] = rebar_dir:src_dirs(rebar_state:opts(State), []). extra_src_dirs_at_root(Config) -> AppDir = ?config(apps, Config), @@ -62,7 +62,7 @@ extra_src_dirs_at_root(Config) -> {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return), - ["foo", "bar", "baz"] = rebar_dir:extra_src_dirs(State, []). + ["foo", "bar", "baz"] = rebar_dir:extra_src_dirs(rebar_state:opts(State), []). src_dirs_in_erl_opts(Config) -> AppDir = ?config(apps, Config), @@ -75,7 +75,7 @@ src_dirs_in_erl_opts(Config) -> {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return), - ["foo", "bar", "baz"] = rebar_dir:src_dirs(State, []). + ["foo", "bar", "baz"] = rebar_dir:src_dirs(rebar_state:opts(State), []). extra_src_dirs_in_erl_opts(Config) -> AppDir = ?config(apps, Config), @@ -88,7 +88,7 @@ extra_src_dirs_in_erl_opts(Config) -> {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return), - ["foo", "bar", "baz"] = rebar_dir:extra_src_dirs(State, []). + ["foo", "bar", "baz"] = rebar_dir:extra_src_dirs(rebar_state:opts(State), []). src_dirs_at_root_and_in_erl_opts(Config) -> AppDir = ?config(apps, Config), @@ -101,7 +101,7 @@ src_dirs_at_root_and_in_erl_opts(Config) -> {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return), - ["baz", "qux", "foo", "bar"] = rebar_dir:src_dirs(State, []). + ["baz", "qux", "foo", "bar"] = rebar_dir:src_dirs(rebar_state:opts(State), []). extra_src_dirs_at_root_and_in_erl_opts(Config) -> AppDir = ?config(apps, Config), @@ -114,7 +114,7 @@ extra_src_dirs_at_root_and_in_erl_opts(Config) -> {ok, State} = rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], return), - ["baz", "qux", "foo", "bar"] = rebar_dir:extra_src_dirs(State, []). + ["baz", "qux", "foo", "bar"] = rebar_dir:extra_src_dirs(rebar_state:opts(State), []). build_basic_app(Config) -> AppDir = ?config(apps, Config), |