diff options
| author | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-05-21 17:20:39 -0500 |
|---|---|---|
| committer | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-05-21 17:20:39 -0500 |
| commit | 62c9c661826f55093d74055dc7bcc4c72d5bcba9 (patch) | |
| tree | bb103f44ac4747b75ed54fcfe2a1e7daf1218257 | |
| parent | 510f4596ce2943a72efa1d5224ad769c9bddc1a4 (diff) | |
| parent | 49d977c2b815a2ce30056e8fd133060576ce575e (diff) | |
Merge pull request #456 from kovyl2404/provider-hooks-namespaces-fix
Properly setup namespace for dependency provider hooks
| -rw-r--r-- | src/rebar_state.erl | 2 | ||||
| -rw-r--r-- | test/rebar_hooks_SUITE.erl | 30 |
2 files changed, 28 insertions, 4 deletions
diff --git a/src/rebar_state.erl b/src/rebar_state.erl index 55081a5..18d6be7 100644 --- a/src/rebar_state.erl +++ b/src/rebar_state.erl @@ -48,7 +48,7 @@ lock = [], current_profiles = [default] :: [atom()], - namespace = undefined :: atom(), + namespace = default :: atom(), command_args = [], command_parsed_args = {[], []}, diff --git a/test/rebar_hooks_SUITE.erl b/test/rebar_hooks_SUITE.erl index be3bdcb..a5136e5 100644 --- a/test/rebar_hooks_SUITE.erl +++ b/test/rebar_hooks_SUITE.erl @@ -6,7 +6,8 @@ init_per_testcase/2, all/0, build_and_clean_app/1, - run_hooks_once/1]). + run_hooks_once/1, + deps_hook_namespace/1]). -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). @@ -19,13 +20,14 @@ init_per_suite(Config) -> Config. end_per_suite(_Config) -> - ok. + meck:unload(). init_per_testcase(_, Config) -> rebar_test_utils:init_rebar_state(Config). all() -> - [build_and_clean_app, run_hooks_once]. + [build_and_clean_app, run_hooks_once, + deps_hook_namespace]. %% Test post provider hook cleans compiled project app, leaving it invalid build_and_clean_app(Config) -> @@ -47,3 +49,25 @@ run_hooks_once(Config) -> rebar_test_utils:create_config(AppDir, RebarConfig), rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]), rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], {ok, [{app, Name, valid}]}). + +deps_hook_namespace(Config) -> + mock_git_resource:mock([{deps, [{some_dep, "0.0.1"}]}]), + Deps = rebar_test_utils:expand_deps(git, [{"some_dep", "0.0.1", []}]), + TopDeps = rebar_test_utils:top_level_deps(Deps), + + RebarConfig = [ + {deps, TopDeps}, + {overrides, [ + {override, some_dep, [ + {provider_hooks, [ + {pre, [ + {compile, clean} + ]} + ]} + ]} + ]} + ], + rebar_test_utils:run_and_check( + Config, RebarConfig, ["compile"], + {ok, [{dep, "some_dep"}]} + ). |