From 5f6b3066815002b0da13a0e8af923cdfe3d23da4 Mon Sep 17 00:00:00 2001 From: Piotr Bazydlo Date: Thu, 9 Mar 2017 13:54:15 +0000 Subject: [PATCH] Fix tests after rebase --- src/registry/routes/component-info.js | 2 -- .../fallback-welcome-with-optional-parameters/.npmignore | 0 .../_package/package.json | 0 .../_package/server.js | 0 .../_package/template.js | 0 .../fallback-welcome-with-optional-parameters/package.json | 0 .../fallback-welcome-with-optional-parameters/server.js | 0 .../fallback-welcome-with-optional-parameters/template.jade | 0 8 files changed, 2 deletions(-) rename test/fixtures/{fallbackRegistryComponents => fallback-registry-components}/fallback-welcome-with-optional-parameters/.npmignore (100%) rename test/fixtures/{fallbackRegistryComponents => fallback-registry-components}/fallback-welcome-with-optional-parameters/_package/package.json (100%) rename test/fixtures/{fallbackRegistryComponents => fallback-registry-components}/fallback-welcome-with-optional-parameters/_package/server.js (100%) rename test/fixtures/{fallbackRegistryComponents => fallback-registry-components}/fallback-welcome-with-optional-parameters/_package/template.js (100%) rename test/fixtures/{fallbackRegistryComponents => fallback-registry-components}/fallback-welcome-with-optional-parameters/package.json (100%) rename test/fixtures/{fallbackRegistryComponents => fallback-registry-components}/fallback-welcome-with-optional-parameters/server.js (100%) rename test/fixtures/{fallbackRegistryComponents => fallback-registry-components}/fallback-welcome-with-optional-parameters/template.jade (100%) diff --git a/src/registry/routes/component-info.js b/src/registry/routes/component-info.js index a94c19182..3be55d9a2 100644 --- a/src/registry/routes/component-info.js +++ b/src/registry/routes/component-info.js @@ -72,9 +72,7 @@ function componentInfo(err, req, res, component) { module.exports = function(conf, repository){ return function(req, res){ - repository.getComponent(req.params.componentName, req.params.componentVersion, function(localRegistryError, localComponent){ - if(localRegistryError && conf.fallbackRegistryUrl) { return getComponentFallback.getComponentInfo(conf, req, res, localRegistryError, function(error, component){ componentInfo(error, req, res, component); diff --git a/test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/.npmignore b/test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/.npmignore similarity index 100% rename from test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/.npmignore rename to test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/.npmignore diff --git a/test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/_package/package.json b/test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/_package/package.json similarity index 100% rename from test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/_package/package.json rename to test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/_package/package.json diff --git a/test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/_package/server.js b/test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/_package/server.js similarity index 100% rename from test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/_package/server.js rename to test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/_package/server.js diff --git a/test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/_package/template.js b/test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/_package/template.js similarity index 100% rename from test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/_package/template.js rename to test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/_package/template.js diff --git a/test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/package.json b/test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/package.json similarity index 100% rename from test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/package.json rename to test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/package.json diff --git a/test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/server.js b/test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/server.js similarity index 100% rename from test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/server.js rename to test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/server.js diff --git a/test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/template.jade b/test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/template.jade similarity index 100% rename from test/fixtures/fallbackRegistryComponents/fallback-welcome-with-optional-parameters/template.jade rename to test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/template.jade