From 45627d84829196f19275fb2303a1915adf7b17e5 Mon Sep 17 00:00:00 2001
From: Carlos Vieira <edu.carlos.vieira@gmail.com>
Date: Mon, 24 Aug 2015 13:06:31 -0300
Subject: [PATCH] Atualizando pacotes npm para versões estaveis

---
 package.json        |  3 ++-
 test/zombie-test.js | 16 ++++++----------
 views/barra.ejs     |  2 +-
 views/index.ejs     |  2 +-
 views/jquery.ejs    |  2 +-
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index ffb64e6..f186e5f 100644
--- a/package.json
+++ b/package.json
@@ -4,13 +4,14 @@
 "engines": {
 "node": "~0.10"
 },
-"dependencies": {
+"devDependencies": {
 "jsdom": "3.1.2",
 "coffee-script": "1.9.3",
 "uglifyjs": "2.4.10",
 "express": "5.0.0-alpha.2",
 "chai": "3.2.0",
 "chai-jq": "0.0.8",
+"mocha": "2.2.5",
 "zombie": "2.*",
 "ejs": "2.3.3"
 },
diff --git a/test/zombie-test.js b/test/zombie-test.js
index ce1ee70..420d5a6 100644
--- a/test/zombie-test.js
+++ b/test/zombie-test.js
@@ -1,7 +1,7 @@
 var chai = require("chai"), plugin = require("chai-jq");
 chai.use(plugin);
 
-var expect = require("chai").expect, assert = require("chai").assert,
+var expect = require("chai").expect,
 	Browser = require("zombie"),
 	app = require("./app");
 
@@ -9,7 +9,7 @@ describe("Testes de conteúdo de HTML da barra", function() {
 	var server, browser, barraUrl;
 	barraUrl = "http://localhost:3000/";
 	before(function() {
-		server = app.listen(3000);
+		//server = app.listen(3000);
 	});
 
 	beforeEach(function() {
@@ -19,25 +19,21 @@ describe("Testes de conteúdo de HTML da barra", function() {
 
 	after(function() {
 		// depois dos testes fechar o servidor
-		server.close();
+		//server.close();
 	});
 
 	it("trocar o conteúdo do #barra-brasil pelo correto", function(done) {
 			browser.visit(barraUrl, function() {
-
          var inner_barra = browser.document.getElementById("barra-brasil");
-			expect(inner_barra.innerHTML).to.equal("<div id=\"wrapper-barra-brasil\"><div class=\"brasil-flag\"><a href=\"http://brasil.gov.br\" class=\"link-barra\">Brasil</a></div><span class=\"acesso-info\"><a href=\"http://brasil.gov.br/barra#acesso-informacao\" class=\"link-barra\">Acesso à informação</a></span><nav><ul class=\"list\"><li><a href=\"#\" id=\"menu-icon\"></a></li><li class=\"list-item first\"><a href=\"http://brasil.gov.br/barra#participe\" class=\"link-barra\">Participe</a></li><li class=\"list-item\"><a href=\"http://www.servicos.gov.br/?pk_campaign=barrabrasil\" class=\"link-barra\">Serviços</a></li><li class=\"list-item\"><a href=\"http://www.planalto.gov.br/legislacao\" class=\"link-barra\">Legislação</a></li><li class=\"list-item last last-item\"><a href=\"http://brasil.gov.br/barra#orgaos-atuacao-canais\" class=\"link-barra\">Canais</a></li></ul></nav></div>");
+			expect(inner_barra.innerHTML).to.equal("<div id=\"wrapper-barra-brasil\"><div class=\"brasil-flag\"><a href=\"http://brasil.gov.br\" class=\"link-barra\">Brasil</a></div><span class=\"acesso-info\"><a href=\"http://brasil.gov.br/barra#acesso-informacao\" class=\"link-barra\">Acesso à informação</a></span><nav><ul class=\"list\"><li><a href=\"#\" id=\"menu-icon\"></a></li><li class=\"list-item first\"><a href=\"http://brasil.gov.br/barra#participe\" class=\"link-barra\">Participe</a></li><li class=\"list-item\"><a href=\"http://www.servicos.gov.br/?pk_campaign=barrabrasil&amp;orgao=http://estruturaorganizacional.dados.gov.br/id/unidade-organizacional/2981\" class=\"link-barra\" id=\"barra-brasil-orgao\">Serviços</a></li><li class=\"list-item\"><a href=\"http://www.planalto.gov.br/legislacao\" class=\"link-barra\">Legislação</a></li><li class=\"list-item last last-item\"><a href=\"http://brasil.gov.br/barra#orgaos-atuacao-canais\" class=\"link-barra\">Canais</a></li></ul></nav></div>");
 			done();
 		});
    });
 	
    it("trocar o conteúdo do #footer-brasil pelo correto", function(done) {
-		browser.visit(barraUrl, function() {
-
+		   browser.visit(barraUrl, function() {
          var inner_footer = browser.document.getElementById("footer-brasil");
-			assert(inner_footer.innerHTML === "<div id=\"wrapper-footer-brasil\"><a href=\"http://www.acessoainformacao.gov.br/\"><span class=\"logo-acesso-footer\"></span></a><a href=\"http://www.brasil.gov.br/\"><span class=\"logo-brasil-footer\"></span></a></div>",
-				"Conteúdo do #footer-brasil deve ser o provido pela barra.js");
-
+			expect(inner_footer.innerHTML).to.equal("<div id=\"wrapper-footer-brasil\"><a href=\"http://www.acessoainformacao.gov.br/\"><span class=\"logo-acesso-footer\"></span></a><a href=\"http://www.brasil.gov.br/\"><span class=\"logo-brasil-footer\"></span></a></div>");
 			done();
 		});
 	});
diff --git a/views/barra.ejs b/views/barra.ejs
index 5ce0743..46cf959 100644
--- a/views/barra.ejs
+++ b/views/barra.ejs
@@ -1 +1 @@
-include ../app/static/barra-brasil.js
+<% include ../app/static/barra-brasil.js %>
diff --git a/views/index.ejs b/views/index.ejs
index 13887c4..bdbcd1c 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -1 +1 @@
-include ../app/templates/exemplo.html
+<% include ../app/templates/exemplo.html %>
diff --git a/views/jquery.ejs b/views/jquery.ejs
index 7d66f36..4e2de6d 100644
--- a/views/jquery.ejs
+++ b/views/jquery.ejs
@@ -1 +1 @@
-include ../app/static/jquery-2.1.3.min.js
+<% include ../app/static/jquery-2.1.3.min.js %>
--
libgit2 0.21.2