@@ -100,14 +100,13 @@ in
100100 "cd ~/code/myapp && git remote add origin root@githost:/root/myorg/myapp.git"
101101 )
102102
103−
104103 with subtest("test pushing code to the remote"):
105104 client.succeed("cd ~/code/myapp && git push -u origin master")
106105 client.succeed("cd ~/code/myapp && git status")
107106
108107 with subtest("test obelisk can pack"):
109108 client.succeed("ob -v thunk pack ~/code/myapp")
110− client.succeed("grep -qF 'git' ~/code/myapp/default.nix")
109+ client.succeed("grep -qF 'git.json' ~/code/myapp/src.nix")
111110 client.succeed("grep -qF 'myorg' ~/code/myapp/git.json")
112111 client.succeed("ob -v thunk unpack ~/code/myapp")
113112
@@ -123,19 +122,19 @@ in
123122 client.succeed("ob -v thunk unpack ~/code/myapp")
124123
125124 with subtest("test building an invalid thunk fails"):
126− client.succeed("cd ~/code/myapp && git checkout -b bad")
125+ client.succeed("cd ~/code/myapp/unpacked && git checkout -b bad")
127126 client.succeed(
128− "cp ${invalidThunkableSample} ~/code/myapp/default.nix"
127+ "cp ${invalidThunkableSample} ~/code/myapp/unpacked/default.nix"
129128 )
130− client.succeed("cd ~/code/myapp && git add .")
129+ client.succeed("cd ~/code/myapp/unpacked && git add .")
131130 client.succeed('git config --global user.email "you@example.com"')
132131 client.succeed('git config --global user.name "Your Name"')
133− client.succeed('cd ~/code/myapp && git commit -m "Bad commit"')
134− client.succeed("cd ~/code/myapp && git push -u origin bad")
132+ client.succeed('cd ~/code/myapp/unpacked && git commit -m "Bad commit"')
133+ client.succeed("cd ~/code/myapp/unpacked && git push -u origin bad")
135134 client.succeed("ob -v thunk pack ~/code/myapp --public")
136135 client.fail("nix-build ~/code/myapp")
137136 client.succeed("ob -v thunk unpack ~/code/myapp")
138− client.succeed("cd ~/code/myapp && git checkout master")
137+ client.succeed("cd ~/code/myapp/unpacked && git checkout master")
139138
140139 with subtest("test obelisk can detect private repos"):
141140 client.succeed("ob -v thunk pack ~/code/myapp")