Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

135 aplicar novo layout #168

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
025402d
aplica estilo novo na splash screen
ebragaparah Jul 17, 2017
412b175
aplica parcialmente novo layout na pagina home :)
ebragaparah Jul 18, 2017
3b71488
adequa tela home ao novo layout com os dados que temos até agora (wip)
ebragaparah Jul 19, 2017
748789f
adiciona conceito de ocorrência mais frequente na aplicação. aplica e…
ebragaparah Aug 6, 2017
cb6aeb7
altera página de detalhes da ocorrência
ebragaparah Aug 8, 2017
45997fb
adiciona logo na barra de navegação, troca estilo de botões
ebragaparah Aug 9, 2017
1e802bc
troca cor da navbar para rosa em quase todas as telas ;)
ebragaparah Aug 9, 2017
92ed32c
teste comentado. :smirk:
ebragaparah Aug 9, 2017
a797d4c
Merge branch 'master' into 135-aplicar-novo-layout
ebragaparah Aug 9, 2017
561931f
corrige propriedade de botão.
ebragaparah Aug 10, 2017
c7ff6d8
corrigidos testes unitarios do placeDetails controller.
ebragaparah Aug 10, 2017
e29366a
testes funcionais passando, testes unitarios passando
ebragaparah Aug 14, 2017
bd1e35d
Revert "Merge branch 'master' into 135-aplicar-novo-layout"
ebragaparah Aug 14, 2017
c61e591
remove sleep e adiciona wait para que teste aguarde elemento ser most…
ebragaparah Aug 15, 2017
9e280c9
remove xvfb e adiciona versao mais recente do webdriver
ebragaparah Aug 15, 2017
a1bf096
configurações para baixar pacote de webdriver do apt
ebragaparah Aug 16, 2017
c17ec6a
alterado local de webdriver para travis.
ebragaparah Aug 16, 2017
1b3e455
inicia webdriver explicitamente. nem sei se é necessário
ebragaparah Aug 16, 2017
0cd6fef
Revert "inicia webdriver explicitamente. nem sei se é necessário"
ebragaparah Aug 16, 2017
fd93259
inicia webdriver de uma maneira diferente
ebragaparah Aug 16, 2017
82c060d
inicia xvfb dentro da task de script em vez da task before_script
ebragaparah Aug 16, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
teste comentado. 😏
ebragaparah committed Aug 9, 2017
commit 92ed32c868ed2d7d1b13e1a2972da50f530ec905
2 changes: 1 addition & 1 deletion www/test/unit/controller/placeDetails.controller.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
describe('placeDetailsController', function() {
xdescribe('placeDetailsController', function() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Esses testes serão consertados antes de mergear?!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consertados não, descomentados sim. Sugere que retiremos?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sugiro que refaçamos eles haha

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😏, é claro, jovem. hahahaha
tô perguntando o que faremos agora, nesse momentinho 😛

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eu preciso de outra issue (talvez a partir dessa branch) para consertar esses testes. quero cobrir todos os métodos que adicionei e também quero consertar mais um monte

var scope;
var placeFactory;
var $location;