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

Make sure we do not commit bower_components folder #65

Merged
merged 3 commits into from
Oct 13, 2015
Merged

Make sure we do not commit bower_components folder #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74477ac
Make sure we do not commit bower_components folder
Oct 13, 2015
1d66116
Update dependencies and make sure we bundle phantomjs for the tests
Oct 13, 2015
037a862
Update wildcard test, from "il" to "mm"
Oct 13, 2015
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ logs
results

node_modules
bower_components
npm-debug.log
coverage*

.idea
.idea
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,13 @@
},
"dependencies": {},
"devDependencies": {
"async": "^0.9.0",
"async": "^1.4.2",
"blanket": "^1.1.5",
"expect.js": "^0.3.1",
"github-changes": "^1.0.0",
"jshint": "^2.5.1",
"mocha": "^1.21.3",
"mocha": "^2.3.3",
"phantomjs": "^1.9.18",
"request": "^2.36.0",
"testling": "^1.7.0",
"travis-cov": "^0.2.5"
Expand Down
8 changes: 4 additions & 4 deletions test/publicsuffix.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ checkPublicSuffix('test.ac', 'test.ac');
});

it('should return the TLD with 1 (wildcard) rule', function(){
checkPublicSuffix('il', null);
checkPublicSuffix('c.il', null);
checkPublicSuffix('b.c.il', 'b.c.il');
checkPublicSuffix('a.b.c.il', 'b.c.il');
checkPublicSuffix('mm', null);
checkPublicSuffix('c.mm', null);
checkPublicSuffix('b.c.mm', 'b.c.mm');
checkPublicSuffix('a.b.c.mm', 'b.c.mm');
});

it('should handle complex TLD', function(){
Expand Down