Skip to content

Commit

Permalink
Working solution, tests failing
Browse files Browse the repository at this point in the history
  • Loading branch information
AntJanus committed Nov 21, 2014
1 parent d9231f0 commit 5d5ed97
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 75 deletions.
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"ui-router": "~0.2.12",
"angular-animate": "~1.3.2",
"angular-mocks": "~1.3.2",
"marked": "~0.3.2"
"marked": "~0.3.2",
"deep-diff": "~0.3.0"
},
"homepage": "https://github.com/zurb/foundation-apps",
"description": "A responsive, Angular-powered web apps framework from ZURB.",
Expand Down
3 changes: 2 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,12 @@ gulp.task('server:start', function() {
});
});

gulp.task('karma-test', ['build'], function() {
gulp.task('karma-test', ['build', 'node-sass'], function() {
var testFiles = [
'build/assets/js/app.js',
'build/assets/js/angular-app.js',
'bower_components/angular-mocks/angular-mocks.js',
'bower_components/deep-diff/index.js',
'build/assets/css/app.css',
'build/assets/css/app_node.css',
'tests/unit/**/*Spec.js'
Expand Down
104 changes: 52 additions & 52 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
{
"name": "foundation-apps",
"version": "0.0.1",
"description": "Foundation for Apps",
"scripts": {
"postinstall": "bower install",
"test": "gulp test",
"start": "gulp"
},
"repository": {
"type": "git",
"url": "https://github.com/zurb/foundation-apps"
},
"keywords": [
"Foundation",
"ZURB",
"responsive",
"apps",
"applications"
],
"author": "ZURB",
"bugs": {
"url": "https://github.com/zurb/foundation-apps/issues"
},
"homepage": "https://github.com/zurb/foundation-apps",
"devDependencies": {
"front-matter": "^0.2.0",
"gulp": "^3.8.8",
"gulp-autoprefixer": "^1.0.1",
"gulp-concat": "^2.4.1",
"gulp-front-matter": "^1.0.0",
"gulp-karma": "0.0.4",
"gulp-ruby-sass": "^0.7.1",
"gulp-sass": "1.2.3",
"gulp-uglify": "^1.0.1",
"gulp-util": "^3.0.1",
"karma-jasmine": "^0.1.5",
"karma-phantomjs-launcher": "^0.1.4",
"protractor": "^1.3.1",
"through2": "^0.6.2"
},
"dependencies": {
"connect-modrewrite": "^0.7.9",
"gulp-connect": "^2.0.6",
"gulp-highlight": "0.0.3",
"gulp-markdown": "^1.0.0",
"highlight.js": "~7.5.0",
"rimraf": "^2.2.8",
"run-sequence": "^1.0.1"
},
"private": true
}
{
"name": "foundation-apps",
"version": "0.0.1",
"description": "Foundation for Apps",
"scripts": {
"postinstall": "bower install",
"test": "gulp test",
"start": "gulp"
},
"repository": {
"type": "git",
"url": "https://github.com/zurb/foundation-apps"
},
"keywords": [
"Foundation",
"ZURB",
"responsive",
"apps",
"applications"
],
"author": "ZURB",
"bugs": {
"url": "https://github.com/zurb/foundation-apps/issues"
},
"homepage": "https://github.com/zurb/foundation-apps",
"devDependencies": {
"front-matter": "^0.2.0",
"gulp": "^3.8.8",
"gulp-autoprefixer": "^1.0.1",
"gulp-concat": "^2.4.1",
"gulp-front-matter": "^1.0.0",
"gulp-karma": "0.0.4",
"gulp-ruby-sass": "^0.7.1",
"gulp-sass": "1.2.3",
"gulp-uglify": "^1.0.1",
"gulp-util": "^3.0.1",
"karma-jasmine": "^0.1.5",
"karma-phantomjs-launcher": "^0.1.4",
"protractor": "^1.3.1",
"through2": "^0.6.2"
},
"dependencies": {
"connect-modrewrite": "^0.7.9",
"gulp-connect": "^2.0.6",
"gulp-highlight": "0.0.3",
"gulp-markdown": "^1.0.0",
"highlight.js": "~7.5.0",
"rimraf": "^2.2.8",
"run-sequence": "^1.0.1"
},
"private": true
}
55 changes: 34 additions & 21 deletions tests/unit/scss/scssSpec.js
Original file line number Diff line number Diff line change
@@ -1,45 +1,58 @@
describe('Sass', function() {
var _$http_;
beforeEach(inject(function($http) {
_$http_ = $http;
}));

describe('node-sass and ruby-sass', inject(function($http) {
describe('node-sass and ruby-sass', function() {
var cssFiles = document.querySelectorAll('link');
var sass = '';
var nodeSass = '';
var sUrl = '';
var nUrl = '';
var sass;
var nodeSass;
var interval;

for(var i = 0; i < cssFiles.length; i++) {
if(cssFiles[i].href.indexOf('app_node') > -1) {
nodeSass = cssFiles[i].href;
nUrl = cssFiles[i].href;
} else if(cssFiles[i].href.indexOf('app')) {
sass = cssFiles[i].href;
sUrl = cssFiles[i].href;
}
}

var deep = DeepDiff.noConflict();
var dd = DeepDiff.noConflict();

beforeEach(function(done) {
$http.get(sass).success(function(data) {
sass = data;
done();
});
var request;

request = new XMLHttpRequest();
request.open('GET', sUrl, false);
request.onreadystatechange = function() {
if(request.readyState == 4 && request.status === 200){
sass = request.responseText;
done();
}
}
request.send(null);

});

beforeEach(function(done) {
$http.get(nodeSass).success(function(data) {
nodeSass = data;
done();
});
var request;

request = new XMLHttpRequest();
request.open('GET', nUrl, false);
request.onreadystatechange = function() {
if(request.readyState == 4 && request.status === 200){
nodeSass = request.responseText;
done();
}
}
request.send(null);

});

it('should be equal', function() {
var differences = diff(nodeSass, sass);
var differences = dd(nodeSass, sass);

expect(differences).toEqual({});

});

}));
});
});

0 comments on commit 5d5ed97

Please sign in to comment.