- If you wish for your ORCID claims to be accessible in the ADS, please
-
fill out this brief form.
+ If you wish for your ORCID claims to be accessible in the ADS, please first
+ fill out this brief form.
diff --git a/test/mocha/core-suite.js b/test/mocha/core-suite.js index 83ece0de1..ed8f2dd44 100644 --- a/test/mocha/core-suite.js +++ b/test/mocha/core-suite.js @@ -2,6 +2,7 @@ define([], function() { var tests = [ '/apps/discovery/router.spec.js', + '/apps/discovery/navigator.spec.js', '/components/app_storage.spec.js', '/components/csrf_manager.spec.js', diff --git a/test/mocha/js/apps/discovery/navigator.spec.js b/test/mocha/js/apps/discovery/navigator.spec.js new file mode 100644 index 000000000..cb950af70 --- /dev/null +++ b/test/mocha/js/apps/discovery/navigator.spec.js @@ -0,0 +1,164 @@ +define([ + 'js/apps/discovery/navigator', + 'js/bugutils/minimal_pubsub', + 'js/components/api_feedback', +], function( + Navigator, + Minsub, + ApiFeedback +){ + + describe("Navigator", function(){ + + it("should handle the orcid endpoint and authenticating if code is provided", function(){ + + var n = new Navigator(); + + var minsub = new Minsub(); + + //fake Services + + var orcidApi = { + //only testing after orcid access has been provided + hasAccess : function(){ + return true + }, + getADSUserData : function(){ + var d = $.Deferred(); + //pretending user hasnt filled in data yet + d.resolve({}); + return d.promise(); + } + }; + var storage = { + get : function(val){ + if (val == "orcidAuthenticating"){ + return true; + } + }, + remove : sinon.spy(function(val){ + }) + }; + + var appStorage = { + executeStashedNav : sinon.spy(function(){ + return true; + }), + + get : function(a){ + if (a == "stashedNav") return ["UserPreferences", {"subView":"orcid"}]; + } + }; + + var AlertsController = { + alert : sinon.spy() + }; + + var MasterPageManager = { + show: sinon.spy(function () { + }) + }; + + var app = { + + getService: function (obj) { + if (obj == "OrcidApi") { + return orcidApi + } + else if (obj == "PersistentStorage") { + return storage + } + }, + getObject: function (obj) { + if (obj == "AppStorage") { + return appStorage; + } + else if (obj == "User") { + return { + isLoggedIn: function () { + return true + } + } + } + else if (obj === "MasterPageManager") { + return MasterPageManager; + } + }, + + getController: function (obj) { + if (obj == "AlertsController") { + return AlertsController + } + }, + + getWidget : function(obj){ + if (obj === "OrcidBigWidget"){ + return sinon.spy(function(){ + var d = $.Deferred(); + d.resolve(); + return d; + }) + } + } + }; + + + n.start(app); + + //1. dont show the modal + + // n.catalog.get("orcid-page").execute(); + // + // //remove this flag that lets us know to show a special modal when user goes to #orcid-page + // expect(storage.remove.args[0][0]).to.eql("orcidAuthenticating"); + // + // //modal wasn't called + // expect(AlertsController.alert.callCount).to.eql(0); + // + // //executestashednav returned true + // expect( n.catalog.get("orcid-page").route).to.be.false; + // + //expect(MasterPageManager.show.callCount).to.eql(0); + + //2. show the modal and redirect to orcidbigwidget + + var appStorage = { + executeStashedNav : sinon.spy(function(){ + return false; + }), + + get : function(a){ + if (a == "stashedNav") return undefined; + } + }; + + n.catalog.get("orcid-page").execute(); + + expect(AlertsController.alert.callCount).to.eql(1); + expect(AlertsController.alert.args[0][0]).to.be.instanceof(ApiFeedback); + expect(AlertsController.alert.args[0][0].title).to.eql("You are now logged in to ORCID"); + + //remove this flag that lets us know to show a special modal when user goes to #orcid-page + expect(storage.remove.args[0][0]).to.eql("orcidAuthenticating"); + + //executestashednav returned true + expect( n.catalog.get("orcid-page").route).to.eql("#user/orcid"); + + expect(MasterPageManager.show.callCount).to.eql(1); + + expect(MasterPageManager.show.args[0][0]).to.eql("OrcidPage"); + + + + + + + + + }); + + + + }); + +}); \ No newline at end of file diff --git a/test/mocha/js/apps/discovery/router.spec.js b/test/mocha/js/apps/discovery/router.spec.js index 895f77228..822578243 100644 --- a/test/mocha/js/apps/discovery/router.spec.js +++ b/test/mocha/js/apps/discovery/router.spec.js @@ -35,14 +35,11 @@ define([ ] }); - fakePubSub.publish(fakePubSub.pubSubKey, fakePubSub.NAVIGATE, "results-page"); expect(fakePubSub.publish.args[2][1]).to.eql("[Router]-Navigate-With-Trigger"); expect(fakePubSub.publish.args[2][2]).to.eql("show-metrics"); - - }) diff --git a/test/mocha/js/apps/todo/app.spec.js b/test/mocha/js/apps/todo/app.spec.js deleted file mode 100644 index f47b8d7f9..000000000 --- a/test/mocha/js/apps/todo/app.spec.js +++ /dev/null @@ -1,25 +0,0 @@ -define(function(require) { - describe("BDD example", function () { - // Runs once before all tests start. - before(function () { - // Add a local function. - this.hello = function () { - return "Hello world!"; - }; - }); - - // Runs once when all tests finish. - after(function () { - // Remove local function. - this.hello = null; - }); - - it("should return expected string result", function () { - // Chai BDD-style assertion. - chai.expect(this.hello()).to - .be.a("string").and - .equal("Hello world!"); - - }); - }); -}); \ No newline at end of file diff --git a/test/mocha/js/apps/todo/router.spec.js b/test/mocha/js/apps/todo/router.spec.js deleted file mode 100644 index ef7852392..000000000 --- a/test/mocha/js/apps/todo/router.spec.js +++ /dev/null @@ -1,18 +0,0 @@ -define(function(require) { - "use strict"; - - var Backbone = require("backbone"); - var Router = require("router"); - - // Test that the Router exists. - describe("Router", function() { - it("should exist", function() { - expect(Router).to.exist; - expect(new Router()).to.be.an.instanceof(Backbone.Router); - }); - - it("should fail when history is started without todos initialized", function() { - chai.assert.throw(function() {Backbone.history.start();}, Error); - }); - }); -}); \ No newline at end of file