github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

When calling versionsFrom with no track, default to METEOR-CORE

Browse Source 
Also a small restructuring I thought I'd need for this test, but ended
up not needing. But it's nice anyways.
This commit is contained in:
Avital Oliver
2014-07-23 20:03:32 -07:00
parent 053f26da5e
commit a533f1ed5d
2 changed files with 72 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/package-source.js
View File

@@ -823,16 +823,20 @@ _.extend(PackageSource.prototype, {
// you don't fill in dependencies for some of your implies/uses, we will
// look at the packages listed in the release to figure that out.
versionsFrom: function (release) {
// If you don't specify a track, use our default.
if (release.indexOf('@') === -1) {
release = catalog.complete.DEFAULT_TRACK + "@" + release;
}
var relInf = release.split('@');
// XXX: Error handling
if (relInf.length !== 2)
throw new Error("Incorrect release spec");
var catalog = require('./catalog.js').official;
// XXX: We pass in true to override the fact that we know that teh
// catalog may not be initialized, but we are pretty sure that the
// releases are there anyway. This is not the right way to do this
// long term.
releaseRecord = catalog.getReleaseVersion(
releaseRecord = catalog.official.getReleaseVersion(
relInf[0], relInf[1], true);
if (!releaseRecord) {
throw new Error("Unknown release "+ release);

92
tools/tests/package-tests.js
View File

@@ -245,6 +245,36 @@ var cleanLocalCache = function () {
}
};
var publishMostBasicPackage = function (s, fullPackageName) {
var run = s.run("create", "--package", fullPackageName);
run.waitSecs(15);
run.expectExit(0);
run.match(fullPackageName);
s.cd(fullPackageName, function () {
run = s.run("publish", "--create");
run.waitSecs(15);
run.expectExit(0);
run.match("Done");
});
};
var publishReleaseInNewTrack = function (s, releaseTrack, tool, packages) {
var relConf = {
track: releaseTrack,
version: "0.9",
recommended: "true",
description: "a test release",
tool: tool + "@1.0.0",
packages: packages
};
s.write("release.json", JSON.stringify(relConf, null, 2));
run = s.run("publish-release", "release.json", "--create-track");
run.waitSecs(15);
run.match("Done");
run.expectExit(0);
};
// Add packages through the command line, and make sure that the correct set of
// changes is reflected in .meteor/packages, .meteor/versions and list
selftest.define("sync local catalog", ["slow"], function () {
@@ -256,42 +286,19 @@ selftest.define("sync local catalog", ["slow"], function () {
var packageName = utils.randomToken();
var fullPackageName = username + ":" + packageName;
var releaseTrack = username + ":TEST-" + utils.randomToken().toUpperCase();
var run;
// First test -- pretend that the user has downloaded meteor for the purpose
// of running a package or an app. Create a package. Clean out the
// data.json, then try to do things with them.
// Publish the most basic package.
run = s.run("create", "--package", fullPackageName);
run.waitSecs(15);
run.expectExit(0);
run.match(fullPackageName);
s.cd(fullPackageName, function () {
run = s.run("publish", "--create");
run.waitSecs(15);
run.expectExit(0);
run.match("Done");
});
publishMostBasicPackage(s, fullPackageName);
// Publish a release. This release is super-fake: the tool is a package that
// is not actually a tool, for example. That's OK for our purposes for now,
// because we only care about the tool version if we run an app from it.
var packages = {};
packages[fullPackageName] ="1.0.0";
var relConf = { track: releaseTrack, version:"0.9",
recommended: "true",
description: "a test release",
tool: fullPackageName + "@1.0.0",
packages: packages
};
s.write("release.json", JSON.stringify(relConf, null, 2));
run = s.run("publish-release", "release.json", "--create-track");
run.waitSecs(15);
run.match("Done");
run.expectExit(0);
packages[fullPackageName] = "1.0.0";
publishReleaseInNewTrack(s, releaseTrack, fullPackageName /*tool*/, packages);
// Create a package that has a versionsFrom for the just-published release.
var newPack = fullPackageName + "2";
@@ -374,6 +381,39 @@ var createAndPublishPackage = function (s, packageName) {
s.cd("..");
};
selftest.define("release track defaults to METEOR-CORE", ["net"], function () {
var s = new Sandbox();
s.set("METEOR_TEST_TMP", files.mkdtemp());
testUtils.login(s, username, password);
var packageName = utils.randomToken();
var fullPackageName = username + ":" + packageName;
var releaseVersion = utils.randomToken();
// Create a package that has a versionsFrom for the just-published
// release, but without the release track present in the call to
// `versionsFrom`. This implies that it should be prefixed
// by "METEOR-CORE@"
var newPack = fullPackageName;
s.createPackage(newPack, "package-of-two-versions");
s.cd(newPack, function() {
var packOpen = s.read("package.js");
packOpen = packOpen + "\nPackage.onUse(function(api) { \n" +
"api.versionsFrom(\"" + releaseVersion + "\");\n" +
"api.use(\"" + fullPackageName + "\"); });";
s.write("package.js", packOpen);
});
// Try to publish the package. Since the package references the release that
// we just published, it needs to resync with the server in order to be able
// to compile itself.
s.cd(newPack, function() {
var run = s.run("publish", "--create");
run.waitSecs(20);
run.matchErr("Unknown release METEOR-CORE@" + releaseVersion);
run.expectExit(8);
});
});
selftest.define("update server package data unit test", ["net"], function () {
var packageStorageFileDir = files.mkdtemp("update-server-package-data");