diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-02-21 17:27:16 -0500 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-02-21 17:27:16 -0500 |
| commit | 8988c9ff6c09da0e2e2e3b7285720e7dfe712730 (patch) | |
| tree | 06c73f7b45512574b4761796b2c66125dacb2868 /test | |
| parent | df30a93891fd85fcad566c100c53e463448662a1 (diff) | |
| parent | 24383e228373d14c23c56225fe3e974dcbb0b43d (diff) | |
Merge pull request #166 from tsloughter/xdg
follow xdg standard. fixes #122
Diffstat (limited to 'test')
| -rw-r--r-- | test/rebar_new_SUITE.erl | 2 | ||||
| -rw-r--r-- | test/rebar_upgrade_SUITE.erl | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/rebar_new_SUITE.erl b/test/rebar_new_SUITE.erl index 62a26af..6b57b74 100644 --- a/test/rebar_new_SUITE.erl +++ b/test/rebar_new_SUITE.erl @@ -23,7 +23,7 @@ end_per_testcase(_, Config) -> mock_home_dir(Path) -> meck:new(rebar_dir, [passthrough]), - meck:expect(rebar_dir, home_dir, fun() -> Path end). + meck:expect(rebar_dir, template_dir, fun(_) -> Path end). mock_empty_escript_templates() -> %% Can't find escript templates unless we run diff --git a/test/rebar_upgrade_SUITE.erl b/test/rebar_upgrade_SUITE.erl index b4daef9..ed0b2d8 100644 --- a/test/rebar_upgrade_SUITE.erl +++ b/test/rebar_upgrade_SUITE.erl @@ -357,10 +357,10 @@ upgrades(delete_d) -> %% running the upgrade code is enough to properly upgrade things. top_level_deps([]) -> []; -top_level_deps([{{Name, Vsn, Ref}, _} | Deps]) -> - [{list_to_atom(Name), Vsn, Ref} | top_level_deps(Deps)]; top_level_deps([{{pkg, Name, Vsn}, _} | Deps]) -> - [{list_to_atom(Name), Vsn} | top_level_deps(Deps)]. + [{list_to_atom(Name), Vsn} | top_level_deps(Deps)]; +top_level_deps([{{Name, Vsn, Ref}, _} | Deps]) -> + [{list_to_atom(Name), Vsn, Ref} | top_level_deps(Deps)]. mock_deps(git, Deps, Upgrades) -> catch mock_git_resource:unmock(), |