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.

Sign up for GitHub

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

Jump to bottom

Es6 #5

Merged
merged 93 commits into from
Jan 21, 2016
Merged

Es6 #5

merged 93 commits into from
Jan 21, 2016

Conversation

des-des
Copy link
Member

@des-des des-des commented Jan 19, 2016

  • parsing logic pulled out of adoro project
  • es6 templates instead of handlebars
  • example server which serves input form and responds with amp file

nelsonic and others added 30 commits October 12, 2014 16:57
@nelsonic
[WiP] spliting out build functions into helpers
c2bd3ec
@nelsonic
traversing posts working
6f539c7
@nelsonic
getPosts(function(err,posts){}) array of posts
f23203a
@nelsonic
titles are clickable in summary view. full page post view working. sl…
d63ab47 
…eep time
@nelsonic
ever-expanding list of features...
4c13a18
@nelsonic
adds hapi, inert & nodemon dependencies see: https://github.com/dwyl/…
6c8168c 
…technology-stack
@nelsonic
update links in package.json to dwyl
aa92188
@jackcarlisle
beginning to convert markdown to amp-html #24
7327f12
@jackcarlisle
changing img to amp-img with regex #24
b31710d
@Conorc1000
set up the testing environment, wrote frist test. #36
a65669f
@jackcarlisle
hard-coding dimensions for images (MVP requirements) #24 #37
defe858
@des-des
first pass at async image dimension fetching. #37
b3df4cd
@des-des
made all request http
d139eea
@des-des
linking together image dimensions with html creation. #24 #37
a72c8af
@Conorc1000
wrote tests for helpers.js
ab917f9
@des-des
finished integrating image dimension retrieval #37
ca55d5e
markdown being converted to amp html using remarkable
86a32ac
@des-des
#24 changed build code. Now includes amp html creation and uses remar…
43c558f 
…kable
@thegsi
handlebars.js creates a blog post html page #39
9def6dc
@Conorc1000
front end tests #63
0d777b2
@des-des
Merge branch 'team2-master' of https://github.com/dwyl/adoro into tea…
6552c1c 
…m2-master
@thegsi
adding changes in views folder to github
429e0fb
@Jbarget
refactoring changing buffer to string
2a5e78f
@Conorc1000
added front end Qunit testing environment #36
6376d26
@Conorc1000
added front end Qunit testing environment #36
d6c44bd
@jackcarlisle
fixing merge conflicts #24 #37
dd3827c
@des-des
fixed bug! #24, FAC6/facfaq#5
281d6a7
@des-des
Merge branch 'team2-master' of https://github.com/dwyl/adoro into tea…
b777354 
…m2-master
@des-des
some comments and merge conflict
47dba7b
@Conorc1000
removed jasmine files
6c4a6be
@nelsonic
Copy link
Member

@des-des we need to collect coverage data for the tests.
annoyingly, when we attempt to run the tests using istanbul no coverage data is collected. see: #17

@nelsonic nelsonic mentioned this pull request Jan 20, 2016
Merged
@nelsonic
Copy link
Member

@des-des good idea to transpile before running tests on Travis 💡
did this work on your local ...?

@des-des
Copy link
Member Author

des-des commented Jan 20, 2016

@nelsonic
trying on local defo much faster than pushing and waiting for travis ...

@nelsonic
Copy link
Member

@des-des when I run anything involving babel on my local machine it takes ages... 😞
I think I might have to sit with you some time to see how you make it go faster... 🐎

@nelsonic
Copy link
Member

@des-des yes, if we are going to ES5 the tests ...

however that still requires the babel build on Travis which we would similarly need to run on local... I'm experimenting with babel-istanbul so that any ES6 code in the project (including in the /test dir) will be transpiled _before_ the tests are run ...

Thoughts...? 💭

Safe journey. 🚄

cc: @rjmk how are you tracking code coverage in your babel-powered projects...?

@codecov-io
Copy link

Current coverage is 100.00%

Branch #5 has no coverage reports uploaded yet.

No diff could be generated. No reports for master found.
Review entire Coverage Diff as of d5be481

Powered by Codecov. Updated on successful CI builds.

@nelsonic
Copy link
Member

@des-des so... this might work... https://travis-ci.org/dwyl/ampl/builds/103683244#L297
what do you think...?

@nelsonic
Copy link
Member

@des-des would you mind investigating the coverage and adding a couple more test cases to cover the conditional branches that are not being executed...?

@des-des
Copy link
Member Author

des-des commented Jan 20, 2016

✨
woop
on it

@des-des
Copy link
Member Author

des-des commented Jan 20, 2016

image

@nelsonic
Copy link
Member

Ok. this is acceptable code. 😜
Nice one @des-des 👍

@nelsonic
Copy link
Member

@des-des totes merging into Master as a first version. Great work! 👍

nelsonic added a commit that referenced this pull request Jan 21, 2016
@nelsonic
Merge pull request #5 from dwyl/es6
8cf50e7 
Es6
@nelsonic nelsonic merged commit 8cf50e7 into master Jan 21, 2016
@nelsonic nelsonic deleted the es6 branch January 21, 2016 12:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement help wanted
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@des-des @nelsonic @codecov-io @jackcarlisle @Conorc1000 @thegsi @Jbarget @mantagen @katkelemen