Skip to content

Commit c5cb550

Browse files
committed
Make Mix projects definitions consistent across tests
1 parent e0fd6de commit c5cb550

File tree

13 files changed

+58
-62
lines changed

13 files changed

+58
-62
lines changed

lib/mix/test/fixtures/deps_status/custom/noscm_repo/mix.exs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ defmodule NoSCMRepo do
22
use Mix.Project
33

44
def project do
5-
[ app: :noscm_repo,
6-
version: "0.1.0",
7-
deps: [
5+
[app: :noscm_repo,
6+
version: "0.1.0",
7+
deps: [
88
{:git_repo, "0.1.0"}
9-
]
10-
]
9+
]]
1110
end
1211
end

lib/mix/test/fixtures/deps_status/custom/raw_repo/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule RawRepo.Mix do
1+
defmodule RawRepo.Mixfile do
22
use Mix.Project
33

44
def project do

lib/mix/test/fixtures/deps_status/deps/invalidapp/mix.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ defmodule InvalidApp.Mixfile do
22
use Mix.Project
33

44
def project do
5-
[ app: :invalidapp,
6-
version: "1.0" ]
5+
[app: :invalidapp,
6+
version: "1.0"]
77
end
88
end

lib/mix/test/fixtures/deps_status/deps/ok/mix.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ defmodule Ok.Mixfile do
22
use Mix.Project
33

44
def project do
5-
[ app: :ok,
6-
version: "0.1.0" ]
5+
[app: :ok,
6+
version: "0.1.0"]
77
end
88
end
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
defmodule Bar.Mix do
1+
defmodule Bar.Mixfile do
22
use Mix.Project
33

44
def project do
55
Mix.shell.info ":bar env is #{Mix.env}"
6-
[ app: :bar,
7-
version: "0.1.0",
8-
deps: [ {:foo, in_umbrella: true} ] ]
6+
[app: :bar,
7+
version: "0.1.0",
8+
deps: [{:foo, in_umbrella: true}]]
99
end
1010
end
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
defmodule Foo.Mix do
1+
defmodule Foo.Mixfile do
22
use Mix.Project
33

44
def project do
55
Mix.shell.info ":foo env is #{Mix.env}"
6-
[ app: :foo,
7-
version: "0.1.0" ]
6+
[app: :foo,
7+
version: "0.1.0"]
88
end
99
end

lib/mix/test/fixtures/umbrella_dep/deps/umbrella/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ defmodule Umbrella.Mixfile do
22
use Mix.Project
33

44
def project do
5-
[ apps_path: "apps" ]
5+
[apps_path: "apps"]
66
end
77
end

lib/mix/test/fixtures/umbrella_dep/mix.exs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ defmodule UmbrellaDep.Mixfile do
22
use Mix.Project
33

44
def project do
5-
[ app: :umbrella_dep,
6-
deps: deps ]
5+
[app: :umbrella_dep,
6+
deps: deps]
77
end
88

99
defp deps do
10-
[ {:umbrella, path: "deps/umbrella"} ]
10+
[{:umbrella, path: "deps/umbrella"}]
1111
end
1212
end

lib/mix/test/mix/rebar_test.exs

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,31 @@ defmodule Mix.RebarTest do
55

66
defmodule RebarAsDep do
77
def project do
8-
[ app: :rebar_as_dep,
9-
version: "0.1.0",
10-
deps: [
11-
{:rebar_dep, path: MixTest.Case.tmp_path("rebar_dep"), app: false}
12-
]
13-
]
8+
[app: :rebar_as_dep,
9+
version: "0.1.0",
10+
deps: [
11+
{:rebar_dep, path: MixTest.Case.tmp_path("rebar_dep"), app: false}
12+
]]
1413
end
1514
end
1615

1716
defmodule Rebar3AsDep do
1817
def project do
19-
[ app: :rebar_as_dep,
20-
version: "0.1.0",
21-
deps: [
22-
{:rebar_dep, path: MixTest.Case.tmp_path("rebar_dep"), app: false, manager: :rebar3}
23-
]
24-
]
18+
[app: :rebar_as_dep,
19+
version: "0.1.0",
20+
deps: [
21+
{:rebar_dep, path: MixTest.Case.tmp_path("rebar_dep"), app: false, manager: :rebar3}
22+
]]
2523
end
2624
end
2725

2826
defmodule RebarOverrideAsDep do
2927
def project do
30-
[ app: :rebar_as_dep,
31-
version: "0.1.0",
32-
deps: [
33-
{:rebar_override, path: MixTest.Case.tmp_path("rebar_override"), app: false, manager: :rebar3}
34-
]
35-
]
28+
[app: :rebar_as_dep,
29+
version: "0.1.0",
30+
deps: [
31+
{:rebar_override, path: MixTest.Case.tmp_path("rebar_override"), app: false, manager: :rebar3}
32+
]]
3633
end
3734
end
3835

@@ -128,7 +125,7 @@ defmodule Mix.RebarTest do
128125
[:git_repo, :git_rebar, :rebar_override]
129126
end
130127
after
131-
purge [GitRepo.Mix]
128+
purge [GitRepo.Mixfile]
132129
end
133130

134131
test "recurs over sub dirs" do

lib/mix/test/mix/tasks/deps.git_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ defmodule Mix.Tasks.DepsGitTest do
130130
assert File.exists?("_build/dev/lib/deps_on_git_repo/ebin")
131131
end
132132
after
133-
purge [GitRepo, GitRepo.Mix]
133+
purge [GitRepo, GitRepo.Mixfile]
134134
end
135135

136136
test "recompiles the project when a dep is fetched" do
@@ -171,7 +171,7 @@ defmodule Mix.Tasks.DepsGitTest do
171171
:ok
172172
end
173173
after
174-
purge [A, B, C, GitRepo, GitRepo.Mix]
174+
purge [A, B, C, GitRepo, GitRepo.Mixfile]
175175
end
176176

177177
test "all up to date dependencies" do

0 commit comments

Comments
 (0)