Download as
Browse Code »

Commit 45627d84829196f19275fb2303a1915adf7b17e5

Authored by Carlos Vieira
1 parent 6e2fd1f9
Exists in master

Atualizando pacotes npm para versões estaveis

Showing 5 changed files with 11 additions and 14 deletions   Show diff stats
package.json
  Diff comments   View file @45627d8
... ... @@ -4,13 +4,14 @@
4 4 "engines": {
5 5 "node": "~0.10"
6 6 },
7   -"dependencies": {
  7 +"devDependencies": {
8 8 "jsdom": "3.1.2",
9 9 "coffee-script": "1.9.3",
10 10 "uglifyjs": "2.4.10",
11 11 "express": "5.0.0-alpha.2",
12 12 "chai": "3.2.0",
13 13 "chai-jq": "0.0.8",
  14 +"mocha": "2.2.5",
14 15 "zombie": "2.*",
15 16 "ejs": "2.3.3"
16 17 },
... ...
test/zombie-test.js
  Diff comments   View file @45627d8
1 1 var chai = require("chai"), plugin = require("chai-jq");
2 2 chai.use(plugin);
3 3  
4   -var expect = require("chai").expect, assert = require("chai").assert,
  4 +var expect = require("chai").expect,
5 5 Browser = require("zombie"),
6 6 app = require("./app");
7 7  
... ... @@ -9,7 +9,7 @@ describe("Testes de conteúdo de HTML da barra", function() {
9 9 var server, browser, barraUrl;
10 10 barraUrl = "http://localhost:3000/";
11 11 before(function() {
12   - server = app.listen(3000);
  12 + //server = app.listen(3000);
13 13 });
14 14  
15 15 beforeEach(function() {
... ... @@ -19,25 +19,21 @@ describe("Testes de conteúdo de HTML da barra", function() {
19 19  
20 20 after(function() {
21 21 // depois dos testes fechar o servidor
22   - server.close();
  22 + //server.close();
23 23 });
24 24  
25 25 it("trocar o conteúdo do #barra-brasil pelo correto", function(done) {
26 26 browser.visit(barraUrl, function() {
27   -
28 27 var inner_barra = browser.document.getElementById("barra-brasil");
29   - 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>");
  28 + 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>");
30 29 done();
31 30 });
32 31 });
33 32  
34 33 it("trocar o conteúdo do #footer-brasil pelo correto", function(done) {
35   - browser.visit(barraUrl, function() {
36   -
  34 + browser.visit(barraUrl, function() {
37 35 var inner_footer = browser.document.getElementById("footer-brasil");
38   - 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>",
39   - "Conteúdo do #footer-brasil deve ser o provido pela barra.js");
40   -
  36 + 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>");
41 37 done();
42 38 });
43 39 });
... ...
views/barra.ejs
  Diff comments   View file @45627d8
1   -include ../app/static/barra-brasil.js
  1 +<% include ../app/static/barra-brasil.js %>
... ...
views/index.ejs
  Diff comments   View file @45627d8
1   -include ../app/templates/exemplo.html
  1 +<% include ../app/templates/exemplo.html %>
... ...
views/jquery.ejs
  Diff comments   View file @45627d8
1   -include ../app/static/jquery-2.1.3.min.js
  1 +<% include ../app/static/jquery-2.1.3.min.js %>
... ...