From 5e9f85f2193cfbd694c188ba451392c80aa15bbd Mon Sep 17 00:00:00 2001 From: Volodymyr Gamula Date: Tue, 27 May 2014 23:22:09 +0300 Subject: [PATCH 01/14] Added task 1 description --- desc.md | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 desc.md diff --git a/desc.md b/desc.md new file mode 100644 index 0000000..06311e9 --- /dev/null +++ b/desc.md @@ -0,0 +1,61 @@ +# Команды cd и pwd + +Вася пишет оболочку для своей операционной системы. В ней непременно должны присутствовать команды для работы с директориями. Для начала он решил обойтись всего двумя командами: cd (смена текущей директории) и pwd (вывод на экран текущей директории). + +Директории в операционной системе Васи образуют традиционную иерархическую древовидную структуру. Существует единственная корневая директория, обозначаемая символом слеш «/». У всех остальных директорий есть названия — непустые строки из строчных латинских букв. У каждой некорневой директории есть родительская директория — та, внутри которой она расположена. Эта директория обозначается как «..». + +Команда cd принимает один параметр, являющийся путем в файловой системе. Команда меняет текущую директорию на директорию, расположенную по заданному пути. Путь состоит из названий директорий, разделённых слешами. В качестве названия директории может использоваться «..», что обозначает переход в родительскую директорию. «..» может встретиться вместо названия директории в любом месте пути, возможно, несколько раз. Если путь начинается со слеша, он считается абсолютным путём, то есть директория меняется на указанную, считая от корневой. Если параметр начинается с имени директории (или «..»), он считается относительным путём, то есть директория меняется на указанную, считая от текущей. + +Команда pwd должна выводить абсолютный путь до текущей директории. Этот путь не должен содержать «..». + +Изначально текущей директорией является корневая. Все директории, явно упоминаемые или проходимые косвенно внутри одной команды cd, считаются существующими. Гарантируется отсутствие попыток перехода в родительскую директорию корневой директории. + +Входные данные +В входных данных n строк по одной команде в каждой строке. В каждой из этих строк записана либо команда pwd, либо команда cd, после которой идёт отделённый пробелом непустой параметр. + +В параметре команды cd используются только строчные латинские буквы, слеши и точки, не может идти два слеша подряд, точки встречаются только как название родительской псевдо-директории. Параметр команды cd не завершается слешем, кроме случая, когда это единственный символ, указывающий на корневую директорию. Параметр команды имеет длину от 1 до 200 символов включительно. + +Директории в файловой системе могут иметь одинаковые имена. + +Выходные данные +Для каждой команды pwd требуется вывести полный абсолютный путь текущей директории, завершённый слешем. Он должен начинаться со слеша и содержать список директорий в порядке вложенности от корневой до текущей, разделённый слешами. Этот путь не должен содержать точек. + + +## Примеры тестов: + +### Входные данные + +``` +pwd +cd /home/vasya +pwd +cd .. +pwd +cd vasya/../petya +pwd +``` + +### Выходные данные + +``` +/ +/home/vasya/ +/home/ +/home/petya/ +``` + +### Входные данные + +``` +cd /a/b +pwd +cd ../a/b +pwd +``` + +### Выходные данные + +``` +/a/b/ +/a/a/b/ +``` \ No newline at end of file From 899f5de8555d5c8d825ef23c98a703f7b412ef17 Mon Sep 17 00:00:00 2001 From: Volodymyr Gamula Date: Tue, 27 May 2014 23:24:05 +0300 Subject: [PATCH 02/14] Added folder for task1 --- Task1/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Task1/.gitkeep diff --git a/Task1/.gitkeep b/Task1/.gitkeep new file mode 100644 index 0000000..e69de29 From bbec10e7494ff5f18fcc32ee1901035ffa568cbe Mon Sep 17 00:00:00 2001 From: Volodymyr Gamula Date: Wed, 28 May 2014 01:29:47 +0300 Subject: [PATCH 03/14] Yeoman webapp boilerplate --- Task1/.editorconfig | 21 ++ Task1/.gitattributes | 1 + Task1/.gitignore | 6 + Task1/.jshintrc | 21 ++ Task1/Gruntfile.js | 376 +++++++++++++++++++++ desc.md => Task1/README.md | 0 Task1/app/.htaccess | 663 +++++++++++++++++++++++++++++++++++++ Task1/app/404.html | 157 +++++++++ Task1/app/favicon.ico | Bin 0 -> 4286 bytes Task1/app/index.html | 97 ++++++ Task1/app/robots.txt | 3 + Task1/app/scripts/main.js | 1 + Task1/app/styles/main.css | 89 +++++ Task1/bower.json | 9 + Task1/package.json | 32 ++ Task1/test/.bowerrc | 3 + Task1/test/bower.json | 9 + Task1/test/index.html | 27 ++ Task1/test/spec/test.js | 13 + 19 files changed, 1528 insertions(+) create mode 100644 Task1/.editorconfig create mode 100644 Task1/.gitattributes create mode 100644 Task1/.gitignore create mode 100644 Task1/.jshintrc create mode 100644 Task1/Gruntfile.js rename desc.md => Task1/README.md (100%) create mode 100644 Task1/app/.htaccess create mode 100644 Task1/app/404.html create mode 100644 Task1/app/favicon.ico create mode 100644 Task1/app/index.html create mode 100644 Task1/app/robots.txt create mode 100644 Task1/app/scripts/main.js create mode 100644 Task1/app/styles/main.css create mode 100644 Task1/bower.json create mode 100644 Task1/package.json create mode 100644 Task1/test/.bowerrc create mode 100644 Task1/test/bower.json create mode 100644 Task1/test/index.html create mode 100644 Task1/test/spec/test.js diff --git a/Task1/.editorconfig b/Task1/.editorconfig new file mode 100644 index 0000000..8a80734 --- /dev/null +++ b/Task1/.editorconfig @@ -0,0 +1,21 @@ +# EditorConfig helps developers define and maintain consistent +# coding styles between different editors and IDEs +# editorconfig.org + +root = true + + +[*] + +# Change these settings to your own preference +indent_style = space +indent_size = 4 + +# We recommend you to keep these unchanged +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false diff --git a/Task1/.gitattributes b/Task1/.gitattributes new file mode 100644 index 0000000..2125666 --- /dev/null +++ b/Task1/.gitattributes @@ -0,0 +1 @@ +* text=auto \ No newline at end of file diff --git a/Task1/.gitignore b/Task1/.gitignore new file mode 100644 index 0000000..2f4628a --- /dev/null +++ b/Task1/.gitignore @@ -0,0 +1,6 @@ +node_modules +dist +.tmp +.sass-cache +bower_components +test/bower_components diff --git a/Task1/.jshintrc b/Task1/.jshintrc new file mode 100644 index 0000000..287bc43 --- /dev/null +++ b/Task1/.jshintrc @@ -0,0 +1,21 @@ +{ + "node": true, + "browser": true, + "esnext": true, + "bitwise": true, + "camelcase": true, + "curly": true, + "eqeqeq": true, + "immed": true, + "indent": 4, + "latedef": true, + "newcap": true, + "noarg": true, + "quotmark": "single", + "undef": true, + "unused": true, + "strict": true, + "trailing": true, + "smarttabs": true, + "jquery": true +} diff --git a/Task1/Gruntfile.js b/Task1/Gruntfile.js new file mode 100644 index 0000000..1b42ab9 --- /dev/null +++ b/Task1/Gruntfile.js @@ -0,0 +1,376 @@ +// Generated on 2014-05-27 using generator-webapp 0.4.9 +'use strict'; + +// # Globbing +// for performance reasons we're only matching one level down: +// 'test/spec/{,*/}*.js' +// use this if you want to recursively match all subfolders: +// 'test/spec/**/*.js' + +module.exports = function (grunt) { + + // Load grunt tasks automatically + require('load-grunt-tasks')(grunt); + + // Time how long tasks take. Can help when optimizing build times + require('time-grunt')(grunt); + + // Configurable paths + var config = { + app: 'app', + dist: 'dist' + }; + + // Define the configuration for all the tasks + grunt.initConfig({ + + // Project settings + config: config, + + // Watches files for changes and runs tasks based on the changed files + watch: { + bower: { + files: ['bower.json'], + tasks: ['bowerInstall'] + }, + js: { + files: ['<%= config.app %>/scripts/{,*/}*.js'], + tasks: ['jshint'], + options: { + livereload: true + } + }, + jstest: { + files: ['test/spec/{,*/}*.js'], + tasks: ['test:watch'] + }, + gruntfile: { + files: ['Gruntfile.js'] + }, + styles: { + files: ['<%= config.app %>/styles/{,*/}*.css'], + tasks: ['newer:copy:styles', 'autoprefixer'] + }, + livereload: { + options: { + livereload: '<%= connect.options.livereload %>' + }, + files: [ + '<%= config.app %>/{,*/}*.html', + '.tmp/styles/{,*/}*.css', + '<%= config.app %>/images/{,*/}*' + ] + } + }, + + // The actual grunt server settings + connect: { + options: { + port: 9000, + open: true, + livereload: 35729, + // Change this to '0.0.0.0' to access the server from outside + hostname: 'localhost' + }, + livereload: { + options: { + middleware: function(connect) { + return [ + connect.static('.tmp'), + connect().use('/bower_components', connect.static('./bower_components')), + connect.static(config.app) + ]; + } + } + }, + test: { + options: { + open: false, + port: 9001, + middleware: function(connect) { + return [ + connect.static('.tmp'), + connect.static('test'), + connect().use('/bower_components', connect.static('./bower_components')), + connect.static(config.app) + ]; + } + } + }, + dist: { + options: { + base: '<%= config.dist %>', + livereload: false + } + } + }, + + // Empties folders to start fresh + clean: { + dist: { + files: [{ + dot: true, + src: [ + '.tmp', + '<%= config.dist %>/*', + '!<%= config.dist %>/.git*' + ] + }] + }, + server: '.tmp' + }, + + // Make sure code styles are up to par and there are no obvious mistakes + jshint: { + options: { + jshintrc: '.jshintrc', + reporter: require('jshint-stylish') + }, + all: [ + 'Gruntfile.js', + '<%= config.app %>/scripts/{,*/}*.js', + '!<%= config.app %>/scripts/vendor/*', + 'test/spec/{,*/}*.js' + ] + }, + + // Mocha testing framework configuration options + mocha: { + all: { + options: { + run: true, + urls: ['http://<%= connect.test.options.hostname %>:<%= connect.test.options.port %>/index.html'] + } + } + }, + + // Add vendor prefixed styles + autoprefixer: { + options: { + browsers: ['last 1 version'] + }, + dist: { + files: [{ + expand: true, + cwd: '.tmp/styles/', + src: '{,*/}*.css', + dest: '.tmp/styles/' + }] + } + }, + + // Automatically inject Bower components into the HTML file + bowerInstall: { + app: { + src: ['<%= config.app %>/index.html'], + exclude: ['bower_components/bootstrap/dist/js/bootstrap.js'] + } + }, + + // Renames files for browser caching purposes + rev: { + dist: { + files: { + src: [ + '<%= config.dist %>/scripts/{,*/}*.js', + '<%= config.dist %>/styles/{,*/}*.css', + '<%= config.dist %>/images/{,*/}*.*', + '<%= config.dist %>/styles/fonts/{,*/}*.*', + '<%= config.dist %>/*.{ico,png}' + ] + } + } + }, + + // Reads HTML for usemin blocks to enable smart builds that automatically + // concat, minify and revision files. Creates configurations in memory so + // additional tasks can operate on them + useminPrepare: { + options: { + dest: '<%= config.dist %>' + }, + html: '<%= config.app %>/index.html' + }, + + // Performs rewrites based on rev and the useminPrepare configuration + usemin: { + options: { + assetsDirs: ['<%= config.dist %>', '<%= config.dist %>/images'] + }, + html: ['<%= config.dist %>/{,*/}*.html'], + css: ['<%= config.dist %>/styles/{,*/}*.css'] + }, + + // The following *-min tasks produce minified files in the dist folder + imagemin: { + dist: { + files: [{ + expand: true, + cwd: '<%= config.app %>/images', + src: '{,*/}*.{gif,jpeg,jpg,png}', + dest: '<%= config.dist %>/images' + }] + } + }, + + svgmin: { + dist: { + files: [{ + expand: true, + cwd: '<%= config.app %>/images', + src: '{,*/}*.svg', + dest: '<%= config.dist %>/images' + }] + } + }, + + htmlmin: { + dist: { + options: { + collapseBooleanAttributes: true, + collapseWhitespace: true, + removeAttributeQuotes: true, + removeCommentsFromCDATA: true, + removeEmptyAttributes: true, + removeOptionalTags: true, + removeRedundantAttributes: true, + useShortDoctype: true + }, + files: [{ + expand: true, + cwd: '<%= config.dist %>', + src: '{,*/}*.html', + dest: '<%= config.dist %>' + }] + } + }, + + // By default, your `index.html`'s will take care of + // minification. These next options are pre-configured if you do not wish + // to use the Usemin blocks. + // cssmin: { + // dist: { + // files: { + // '<%= config.dist %>/styles/main.css': [ + // '.tmp/styles/{,*/}*.css', + // '<%= config.app %>/styles/{,*/}*.css' + // ] + // } + // } + // }, + // uglify: { + // dist: { + // files: { + // '<%= config.dist %>/scripts/scripts.js': [ + // '<%= config.dist %>/scripts/scripts.js' + // ] + // } + // } + // }, + // concat: { + // dist: {} + // }, + + // Copies remaining files to places other tasks can use + copy: { + dist: { + files: [{ + expand: true, + dot: true, + cwd: '<%= config.app %>', + dest: '<%= config.dist %>', + src: [ + '*.{ico,png,txt}', + '.htaccess', + 'images/{,*/}*.webp', + '{,*/}*.html', + 'styles/fonts/{,*/}*.*' + ] + }, { + expand: true, + dot: true, + cwd: 'bower_components/bootstrap/dist', + src: ['fonts/*.*'], + dest: '<%= config.dist %>' + }] + }, + styles: { + expand: true, + dot: true, + cwd: '<%= config.app %>/styles', + dest: '.tmp/styles/', + src: '{,*/}*.css' + } + }, + + // Run some tasks in parallel to speed up build process + concurrent: { + server: [ + 'copy:styles' + ], + test: [ + 'copy:styles' + ], + dist: [ + 'copy:styles', + 'imagemin', + 'svgmin' + ] + } + }); + + + grunt.registerTask('serve', function (target) { + if (target === 'dist') { + return grunt.task.run(['build', 'connect:dist:keepalive']); + } + + grunt.task.run([ + 'clean:server', + 'concurrent:server', + 'autoprefixer', + 'connect:livereload', + 'watch' + ]); + }); + + grunt.registerTask('server', function (target) { + grunt.log.warn('The `server` task has been deprecated. Use `grunt serve` to start a server.'); + grunt.task.run([target ? ('serve:' + target) : 'serve']); + }); + + grunt.registerTask('test', function (target) { + if (target !== 'watch') { + grunt.task.run([ + 'clean:server', + 'concurrent:test', + 'autoprefixer' + ]); + } + + grunt.task.run([ + 'connect:test', + 'mocha' + ]); + }); + + grunt.registerTask('build', [ + 'clean:dist', + 'useminPrepare', + 'concurrent:dist', + 'autoprefixer', + 'concat', + 'cssmin', + 'uglify', + 'copy:dist', + 'rev', + 'usemin', + 'htmlmin' + ]); + + grunt.registerTask('default', [ + 'newer:jshint', + 'test', + 'build' + ]); +}; diff --git a/desc.md b/Task1/README.md similarity index 100% rename from desc.md rename to Task1/README.md diff --git a/Task1/app/.htaccess b/Task1/app/.htaccess new file mode 100644 index 0000000..ca34658 --- /dev/null +++ b/Task1/app/.htaccess @@ -0,0 +1,663 @@ +# Apache Server Configs v2.2.0 | MIT License +# https://github.com/h5bp/server-configs-apache + +# (!) Using `.htaccess` files slows down Apache, therefore, if you have access +# to the main server config file (usually called `httpd.conf`), you should add +# this logic there: http://httpd.apache.org/docs/current/howto/htaccess.html. + +# ############################################################################## +# # CROSS-ORIGIN RESOURCE SHARING (CORS) # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | Cross-domain AJAX requests | +# ------------------------------------------------------------------------------ + +# Allow cross-origin AJAX requests. +# http://code.google.com/p/html5security/wiki/CrossOriginRequestSecurity +# http://enable-cors.org/ + +# +# Header set Access-Control-Allow-Origin "*" +# + +# ------------------------------------------------------------------------------ +# | CORS-enabled images | +# ------------------------------------------------------------------------------ + +# Send the CORS header for images when browsers request it. +# https://developer.mozilla.org/en-US/docs/HTML/CORS_Enabled_Image +# http://blog.chromium.org/2011/07/using-cross-domain-images-in-webgl-and.html +# http://hacks.mozilla.org/2011/11/using-cors-to-load-webgl-textures-from-cross-domain-images/ + + + + + SetEnvIf Origin ":" IS_CORS + Header set Access-Control-Allow-Origin "*" env=IS_CORS + + + + +# ------------------------------------------------------------------------------ +# | Web fonts access | +# ------------------------------------------------------------------------------ + +# Allow access to web fonts from all domains. + + + + Header set Access-Control-Allow-Origin "*" + + + + +# ############################################################################## +# # ERRORS # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | 404 error prevention for non-existing redirected folders | +# ------------------------------------------------------------------------------ + +# Prevent Apache from returning a 404 error as the result of a rewrite +# when the directory with the same name does not exist. +# http://httpd.apache.org/docs/current/content-negotiation.html#multiviews +# http://www.webmasterworld.com/apache/3808792.htm + +Options -MultiViews + +# ------------------------------------------------------------------------------ +# | Custom error messages / pages | +# ------------------------------------------------------------------------------ + +# Customize what Apache returns to the client in case of an error. +# http://httpd.apache.org/docs/current/mod/core.html#errordocument + +ErrorDocument 404 /404.html + + +# ############################################################################## +# # INTERNET EXPLORER # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | Better website experience | +# ------------------------------------------------------------------------------ + +# Force Internet Explorer to render pages in the highest available mode +# in the various cases when it may not. +# http://hsivonen.iki.fi/doctype/ie-mode.pdf + + + Header set X-UA-Compatible "IE=edge" + # `mod_headers` cannot match based on the content-type, however, this + # header should be send only for HTML pages and not for the other resources + + Header unset X-UA-Compatible + + + +# ------------------------------------------------------------------------------ +# | Cookie setting from iframes | +# ------------------------------------------------------------------------------ + +# Allow cookies to be set from iframes in Internet Explorer. +# http://msdn.microsoft.com/en-us/library/ms537343.aspx +# http://www.w3.org/TR/2000/CR-P3P-20001215/ + +# +# Header set P3P "policyref=\"/w3c/p3p.xml\", CP=\"IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT\"" +# + + +# ############################################################################## +# # MIME TYPES AND ENCODING # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | Proper MIME types for all files | +# ------------------------------------------------------------------------------ + + + + # Audio + AddType audio/mp4 m4a f4a f4b + AddType audio/ogg oga ogg opus + + # Data interchange + AddType application/json json map + AddType application/ld+json jsonld + + # JavaScript + # Normalize to standard type. + # http://tools.ietf.org/html/rfc4329#section-7.2 + AddType application/javascript js + + # Video + AddType video/mp4 f4v f4p m4v mp4 + AddType video/ogg ogv + AddType video/webm webm + AddType video/x-flv flv + + # Web fonts + AddType application/font-woff woff + AddType application/vnd.ms-fontobject eot + + # Browsers usually ignore the font MIME types and simply sniff the bytes + # to figure out the font type. + # http://mimesniff.spec.whatwg.org/#matching-a-font-type-pattern + + # Chrome however, shows a warning if any other MIME types are used for + # the following fonts. + + AddType application/x-font-ttf ttc ttf + AddType font/opentype otf + + # Make SVGZ fonts work on the iPad. + # https://twitter.com/FontSquirrel/status/14855840545 + AddType image/svg+xml svgz + AddEncoding gzip svgz + + # Other + AddType application/octet-stream safariextz + AddType application/x-chrome-extension crx + AddType application/x-opera-extension oex + AddType application/x-web-app-manifest+json webapp + AddType application/x-xpinstall xpi + AddType application/xml atom rdf rss xml + AddType image/webp webp + AddType image/x-icon cur + AddType text/cache-manifest appcache manifest + AddType text/vtt vtt + AddType text/x-component htc + AddType text/x-vcard vcf + + + +# ------------------------------------------------------------------------------ +# | UTF-8 encoding | +# ------------------------------------------------------------------------------ + +# Use UTF-8 encoding for anything served as `text/html` or `text/plain`. +AddDefaultCharset utf-8 + +# Force UTF-8 for certain file formats. + + AddCharset utf-8 .atom .css .js .json .jsonld .rss .vtt .webapp .xml + + + +# ############################################################################## +# # URL REWRITES # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | Rewrite engine | +# ------------------------------------------------------------------------------ + +# Turn on the rewrite engine and enable the `FollowSymLinks` option (this is +# necessary in order for the following directives to work). + +# If your web host doesn't allow the `FollowSymlinks` option, you may need to +# comment it out and use `Options +SymLinksIfOwnerMatch`, but be aware of the +# performance impact. +# http://httpd.apache.org/docs/current/misc/perf-tuning.html#symlinks + +# Also, some cloud hosting services require `RewriteBase` to be set. +# http://www.rackspace.com/knowledge_center/frequently-asked-question/why-is-mod-rewrite-not-working-on-my-site + + + Options +FollowSymlinks + # Options +SymLinksIfOwnerMatch + RewriteEngine On + # RewriteBase / + + +# ------------------------------------------------------------------------------ +# | Suppressing / Forcing the `www.` at the beginning of URLs | +# ------------------------------------------------------------------------------ + +# The same content should never be available under two different URLs, +# especially not with and without `www.` at the beginning. This can cause +# SEO problems (duplicate content), and therefore, you should choose one +# of the alternatives and redirect the other one. + +# By default `Option 1` (no `www.`) is activated. +# http://no-www.org/faq.php?q=class_b + +# If you would prefer to use `Option 2`, just comment out all the lines +# from `Option 1` and uncomment the ones from `Option 2`. + +# IMPORTANT: NEVER USE BOTH RULES AT THE SAME TIME! + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +# Option 1: rewrite www.example.com → example.com + + + RewriteCond %{HTTPS} !=on + RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC] + RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L] + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +# Option 2: rewrite example.com → www.example.com + +# Be aware that the following might not be a good idea if you use "real" +# subdomains for certain parts of your website. + +# +# RewriteCond %{HTTPS} !=on +# RewriteCond %{HTTP_HOST} !^www\. [NC] +# RewriteCond %{SERVER_ADDR} !=127.0.0.1 +# RewriteCond %{SERVER_ADDR} !=::1 +# RewriteRule ^ http://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L] +# + + +# ############################################################################## +# # SECURITY # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | Clickjacking | +# ------------------------------------------------------------------------------ + +# Protect website against clickjacking. + +# The example below sends the `X-Frame-Options` response header with the value +# `DENY`, informing browsers not to display the web page content in any frame. + +# This might not be the best setting for everyone. You should read about the +# other two possible values for `X-Frame-Options`: `SAMEORIGIN` & `ALLOW-FROM`. +# http://tools.ietf.org/html/rfc7034#section-2.1 + +# Keep in mind that while you could send the `X-Frame-Options` header for all +# of your site’s pages, this has the potential downside that it forbids even +# non-malicious framing of your content (e.g.: when users visit your site using +# a Google Image Search results page). + +# Nonetheless, you should ensure that you send the `X-Frame-Options` header for +# all pages that allow a user to make a state changing operation (e.g: pages +# that contain one-click purchase links, checkout or bank-transfer confirmation +# pages, pages that make permanent configuration changes, etc.). + +# Sending the `X-Frame-Options` header can also protect your website against +# more than just clickjacking attacks: https://cure53.de/xfo-clickjacking.pdf. + +# http://tools.ietf.org/html/rfc7034 +# http://blogs.msdn.com/b/ieinternals/archive/2010/03/30/combating-clickjacking-with-x-frame-options.aspx +# https://www.owasp.org/index.php/Clickjacking + +# +# Header set X-Frame-Options "DENY" +# +# Header unset X-Frame-Options +# +# + +# ------------------------------------------------------------------------------ +# | Content Security Policy (CSP) | +# ------------------------------------------------------------------------------ + +# Mitigate the risk of cross-site scripting and other content-injection attacks. + +# This can be done by setting a `Content Security Policy` which whitelists +# trusted sources of content for your website. + +# The example header below allows ONLY scripts that are loaded from the current +# site's origin (no inline scripts, no CDN, etc). This almost certainly won't +# work as-is for your site! + +# For more details on how to craft a reasonable policy for your site, read: +# http://html5rocks.com/en/tutorials/security/content-security-policy (or the +# specification: http://w3.org/TR/CSP). Also, to make things easier, you can +# use an online CSP header generator such as: http://cspisawesome.com/. + +# +# Header set Content-Security-Policy "script-src 'self'; object-src 'self'" +# +# Header unset Content-Security-Policy +# +# + +# ------------------------------------------------------------------------------ +# | File access | +# ------------------------------------------------------------------------------ + +# Block access to directories without a default document. +# You should leave the following uncommented, as you shouldn't allow anyone to +# surf through every directory on your server (which may includes rather private +# places such as the CMS's directories). + + + Options -Indexes + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +# Block access to hidden files and directories. +# This includes directories used by version control systems such as Git and SVN. + + + RewriteCond %{SCRIPT_FILENAME} -d [OR] + RewriteCond %{SCRIPT_FILENAME} -f + RewriteRule "(^|/)\." - [F] + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +# Block access to files that can expose sensitive information. + +# By default, block access to backup and source files that may be left by some +# text editors and can pose a security risk when anyone has access to them. +# http://feross.org/cmsploit/ + +# IMPORTANT: Update the `` regular expression from below to include +# any files that might end up on your production server and can expose sensitive +# information about your website. These files may include: configuration files, +# files that contain metadata about the project (e.g.: project dependencies), +# build scripts, etc.. + + + + # Apache < 2.3 + + Order allow,deny + Deny from all + Satisfy All + + + # Apache ≥ 2.3 + + Require all denied + + + + +# ------------------------------------------------------------------------------ +# | Reducing MIME-type security risks | +# ------------------------------------------------------------------------------ + +# Prevent some browsers from MIME-sniffing the response. + +# This reduces exposure to drive-by download attacks and should be enable +# especially if the web server is serving user uploaded content, content +# that could potentially be treated by the browser as executable. + +# http://blogs.msdn.com/b/ie/archive/2008/07/02/ie8-security-part-v-comprehensive-protection.aspx +# http://msdn.microsoft.com/en-us/library/ie/gg622941.aspx +# http://mimesniff.spec.whatwg.org/ + +# +# Header set X-Content-Type-Options "nosniff" +# + +# ------------------------------------------------------------------------------ +# | Reflected Cross-Site Scripting (XSS) attacks | +# ------------------------------------------------------------------------------ + +# (1) Try to re-enable the Cross-Site Scripting (XSS) filter built into the +# most recent web browsers. +# +# The filter is usually enabled by default, but in some cases it may be +# disabled by the user. However, in Internet Explorer for example, it can +# be re-enabled just by sending the `X-XSS-Protection` header with the +# value of `1`. +# +# (2) Prevent web browsers from rendering the web page if a potential reflected +# (a.k.a non-persistent) XSS attack is detected by the filter. +# +# By default, if the filter is enabled and browsers detect a reflected +# XSS attack, they will attempt to block the attack by making the smallest +# possible modifications to the returned web page. +# +# Unfortunately, in some browsers (e.g.: Internet Explorer), this default +# behavior may allow the XSS filter to be exploited, thereby, it's better +# to tell browsers to prevent the rendering of the page altogether, instead +# of attempting to modify it. +# +# http://hackademix.net/2009/11/21/ies-xss-filter-creates-xss-vulnerabilities +# +# IMPORTANT: Do not rely on the XSS filter to prevent XSS attacks! Ensure that +# you are taking all possible measures to prevent XSS attacks, the most obvious +# being: validating and sanitizing your site's inputs. +# +# http://blogs.msdn.com/b/ie/archive/2008/07/02/ie8-security-part-iv-the-xss-filter.aspx +# http://blogs.msdn.com/b/ieinternals/archive/2011/01/31/controlling-the-internet-explorer-xss-filter-with-the-x-xss-protection-http-header.aspx +# https://www.owasp.org/index.php/Cross-site_Scripting_%28XSS%29 + +# +# # (1) (2) +# Header set X-XSS-Protection "1; mode=block" +# +# Header unset X-XSS-Protection +# +# + +# ------------------------------------------------------------------------------ +# | Secure Sockets Layer (SSL) | +# ------------------------------------------------------------------------------ + +# Rewrite secure requests properly in order to prevent SSL certificate warnings. +# E.g.: prevent `https://www.example.com` when your certificate only allows +# `https://secure.example.com`. + +# +# RewriteCond %{SERVER_PORT} !^443 +# RewriteRule ^ https://example-domain-please-change-me.com%{REQUEST_URI} [R=301,L] +# + +# ------------------------------------------------------------------------------ +# | HTTP Strict Transport Security (HSTS) | +# ------------------------------------------------------------------------------ + +# Force client-side SSL redirection. + +# If a user types `example.com` in his browser, the above rule will redirect +# him to the secure version of the site. That still leaves a window of +# opportunity (the initial HTTP connection) for an attacker to downgrade or +# redirect the request. + +# The following header ensures that browser will ONLY connect to your server +# via HTTPS, regardless of what the users type in the address bar. + +# http://tools.ietf.org/html/draft-ietf-websec-strict-transport-sec-14#section-6.1 +# http://www.html5rocks.com/en/tutorials/security/transport-layer-security/ + +# IMPORTANT: Remove the `includeSubDomains` optional directive if the subdomains +# are not using HTTPS. + +# +# Header set Strict-Transport-Security "max-age=16070400; includeSubDomains" +# + +# ------------------------------------------------------------------------------ +# | Server software information | +# ------------------------------------------------------------------------------ + +# Avoid displaying the exact Apache version number, the description of the +# generic OS-type and the information about Apache's compiled-in modules. + +# ADD THIS DIRECTIVE IN THE `httpd.conf` AS IT WILL NOT WORK IN THE `.htaccess`! + +# ServerTokens Prod + + +# ############################################################################## +# # WEB PERFORMANCE # +# ############################################################################## + +# ------------------------------------------------------------------------------ +# | Compression | +# ------------------------------------------------------------------------------ + + + + # Force compression for mangled headers. + # http://developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping + + + SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding + RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding + + + + # Compress all output labeled with one of the following MIME-types + # (for Apache versions below 2.3.7, you don't need to enable `mod_filter` + # and can remove the `` and `` lines + # as `AddOutputFilterByType` is still in the core directives). + + AddOutputFilterByType DEFLATE application/atom+xml \ + application/javascript \ + application/json \ + application/ld+json \ + application/rss+xml \ + application/vnd.ms-fontobject \ + application/x-font-ttf \ + application/x-web-app-manifest+json \ + application/xhtml+xml \ + application/xml \ + font/opentype \ + image/svg+xml \ + image/x-icon \ + text/css \ + text/html \ + text/plain \ + text/x-component \ + text/xml + + + + +# ------------------------------------------------------------------------------ +# | Content transformations | +# ------------------------------------------------------------------------------ + +# Prevent mobile network providers from modifying the website's content. +# http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.5. + +# +# Header set Cache-Control "no-transform" +# + +# ------------------------------------------------------------------------------ +# | ETags | +# ------------------------------------------------------------------------------ + +# Remove `ETags` as resources are sent with far-future expires headers. +# http://developer.yahoo.com/performance/rules.html#etags. + +# `FileETag None` doesn't work in all cases. + + Header unset ETag + + +FileETag None + +# ------------------------------------------------------------------------------ +# | Expires headers | +# ------------------------------------------------------------------------------ + +# The following expires headers are set pretty far in the future. If you +# don't control versioning with filename-based cache busting, consider +# lowering the cache time for resources such as style sheets and JavaScript +# files to something like one week. + + + + ExpiresActive on + ExpiresDefault "access plus 1 month" + + # CSS + ExpiresByType text/css "access plus 1 year" + + # Data interchange + ExpiresByType application/json "access plus 0 seconds" + ExpiresByType application/ld+json "access plus 0 seconds" + ExpiresByType application/xml "access plus 0 seconds" + ExpiresByType text/xml "access plus 0 seconds" + + # Favicon (cannot be renamed!) and cursor images + ExpiresByType image/x-icon "access plus 1 week" + + # HTML components (HTCs) + ExpiresByType text/x-component "access plus 1 month" + + # HTML + ExpiresByType text/html "access plus 0 seconds" + + # JavaScript + ExpiresByType application/javascript "access plus 1 year" + + # Manifest files + ExpiresByType application/x-web-app-manifest+json "access plus 0 seconds" + ExpiresByType text/cache-manifest "access plus 0 seconds" + + # Media + ExpiresByType audio/ogg "access plus 1 month" + ExpiresByType image/gif "access plus 1 month" + ExpiresByType image/jpeg "access plus 1 month" + ExpiresByType image/png "access plus 1 month" + ExpiresByType video/mp4 "access plus 1 month" + ExpiresByType video/ogg "access plus 1 month" + ExpiresByType video/webm "access plus 1 month" + + # Web feeds + ExpiresByType application/atom+xml "access plus 1 hour" + ExpiresByType application/rss+xml "access plus 1 hour" + + # Web fonts + ExpiresByType application/font-woff "access plus 1 month" + ExpiresByType application/vnd.ms-fontobject "access plus 1 month" + ExpiresByType application/x-font-ttf "access plus 1 month" + ExpiresByType font/opentype "access plus 1 month" + ExpiresByType image/svg+xml "access plus 1 month" + + + +# ------------------------------------------------------------------------------ +# | Filename-based cache busting | +# ------------------------------------------------------------------------------ + +# If you're not using a build process to manage your filename version revving, +# you might want to consider enabling the following directives to route all +# requests such as `/css/style.12345.css` to `/css/style.css`. + +# To understand why this is important and a better idea than `*.css?v231`, read: +# http://stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring + +# +# RewriteCond %{REQUEST_FILENAME} !-f +# RewriteRule ^(.+)\.(\d+)\.(js|css|png|jpe?g|gif)$ $1.$3 [L] +# + +# ------------------------------------------------------------------------------ +# | File concatenation | +# ------------------------------------------------------------------------------ + +# Allow concatenation from within specific style sheets and JavaScript files. + +# e.g.: +# +# If you have the following content in a file +# +# +# +# +# Apache will replace it with the content from the specified files. + +# +# +# Options +Includes +# AddOutputFilterByType INCLUDES application/javascript application/json +# SetOutputFilter INCLUDES +# +# +# Options +Includes +# AddOutputFilterByType INCLUDES text/css +# SetOutputFilter INCLUDES +# +# diff --git a/Task1/app/404.html b/Task1/app/404.html new file mode 100644 index 0000000..fdace4a --- /dev/null +++ b/Task1/app/404.html @@ -0,0 +1,157 @@ + + + + + Page Not Found :( + + + +
+

Not found :(

+

Sorry, but the page you were trying to view does not exist.

+

It looks like this was the result of either:

+
    +
  • a mistyped address
  • +
  • an out-of-date link
  • +
+ + +
+ + diff --git a/Task1/app/favicon.ico b/Task1/app/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..6527905307f19ba00762f9241f7eb535fa84a2f9 GIT binary patch literal 4286 zcmchaPe@cz6vpqQW1y54B@{_hhFD-kWPgyXjSGVaf);_51TESOlSPOdvy}@W5Q+** zs6~RrtlR}7(V|sCkP&1f7!5{Hixw@4+x@+HXSm*Z^WGalm2d8S=brO@=iGm9MyZ7P zPo)%}YN|=8W~EfSfibDm2H3qnGq$y%h@zqVv#zn@@WvhIGJ8*ECePe@roq(*vwGys z4?Q;bI~MRIM&jXu6Yg@wqQ#8&8x#z55E}ONd3<&rw_h!5AbBx{CcZ%&z736jHxFa0 zsBLqly3+dQ%MZGH{QU}GW6bsq=@$a@sXtac^<8>8uP>*+d!Qdtv&&mnKlvE_T-+SC z*QNCVwcvq%+&DDc+T}Uf(2_FavDN{-&hCpIs?aW=A$mcrzyD+9(025i1~K&uVf&w4 zItQLK9T{7k?s@bnU*&p+<^UI*aHA1aH+Fo^PAzM|xjNK09?2V(Cme7IFB(BP?7#at z(>DB3w`AUFS~=(LUBdZ>v-SG4J~%Mrfj&05Z)oj13l5tbEq4x>8+;FC0Dvr zbJY#7PS$+yE_Cf7gxqQEC@RoZX5J^}71l+`Q~qnOF4D za`lhjUuqZa-sj)EHDleV2i|mc!Ly-@7IwzPM{?pBUt(+@IHi8HTz#Iq9)9h|hrL3) zfOT#@|5$JCxmRjsOj>&kUt(m8*57|W(FoE`CX*8edYv%j=3sR5>!hvglJ#@8K6j$g z&IuUbRC_{)p}sbyx%UD6Fki;t6nDk0gT5&6Q_at7FbVVOu?4VK{oR#!kyYbCc;<4+LITzoZ8-~O5L+9MiLHL4NyME>! z;Ky7<)UR!gN_~GXhMvPMHNB;EmmIK}eHD&~cRx89jth}IM#tU%ablw0|GxfE9IjRR zl-)b-IvC#UD!IewzPL77SI>R+?}<2ERr|R2o~zCC8rJUR8>DI5*0O$6+k~wZ)Mt;b z(Hul-OFl+F))}lK&&Yi*+S2kJmHDbdBWOQnaSA6S|#* + + + + xpk + + + + + + + + + + + + + + + + + +
+
+ +

xpk

+
+ +
+

'Allo, 'Allo!

+

Always a pleasure scaffolding your apps.

+

Splendid!

+
+ +
+
+

HTML5 Boilerplate

+

HTML5 Boilerplate is a professional front-end template for building fast, robust, and adaptable web apps or sites.

+ + + +

Bootstrap

+

Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.

+ + +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Task1/app/robots.txt b/Task1/app/robots.txt new file mode 100644 index 0000000..ee2cc21 --- /dev/null +++ b/Task1/app/robots.txt @@ -0,0 +1,3 @@ +# robotstxt.org/ + +User-agent: * diff --git a/Task1/app/scripts/main.js b/Task1/app/scripts/main.js new file mode 100644 index 0000000..20ca76d --- /dev/null +++ b/Task1/app/scripts/main.js @@ -0,0 +1 @@ +console.log('\'Allo \'Allo!'); \ No newline at end of file diff --git a/Task1/app/styles/main.css b/Task1/app/styles/main.css new file mode 100644 index 0000000..b5f5c3c --- /dev/null +++ b/Task1/app/styles/main.css @@ -0,0 +1,89 @@ +.browsehappy { + margin: 0.2em 0; + background: #ccc; + color: #000; + padding: 0.2em 0; +} + +/* Space out content a bit */ +body { + padding-top: 20px; + padding-bottom: 20px; +} + +/* Everything but the jumbotron gets side spacing for mobile first views */ +.header, +.marketing, +.footer { + padding-left: 15px; + padding-right: 15px; +} + +/* Custom page header */ +.header { + border-bottom: 1px solid #e5e5e5; +} + +/* Make the masthead heading the same height as the navigation */ +.header h3 { + margin-top: 0; + margin-bottom: 0; + line-height: 40px; + padding-bottom: 19px; +} + +/* Custom page footer */ +.footer { + padding-top: 19px; + color: #777; + border-top: 1px solid #e5e5e5; +} + +.container-narrow > hr { + margin: 30px 0; +} + +/* Main marketing message and sign up button */ +.jumbotron { + text-align: center; + border-bottom: 1px solid #e5e5e5; +} + +.jumbotron .btn { + font-size: 21px; + padding: 14px 24px; +} + +/* Supporting marketing content */ +.marketing { + margin: 40px 0; +} + +.marketing p + h4 { + margin-top: 28px; +} + +/* Responsive: Portrait tablets and up */ +@media screen and (min-width: 768px) { + .container { + max-width: 730px; + } + + /* Remove the padding we set earlier */ + .header, + .marketing, + .footer { + padding-left: 0; + padding-right: 0; + } + + /* Space out the masthead */ + .header { + margin-bottom: 30px; + } + + /* Remove the bottom border on the jumbotron for visual effect */ + .jumbotron { + border-bottom: 0; + } +} diff --git a/Task1/bower.json b/Task1/bower.json new file mode 100644 index 0000000..fffc66b --- /dev/null +++ b/Task1/bower.json @@ -0,0 +1,9 @@ +{ + "name": "xpk", + "private": true, + "dependencies": { + "bootstrap": "~3.0.3", + "jquery": "~1.11.0" + }, + "devDependencies": {} +} diff --git a/Task1/package.json b/Task1/package.json new file mode 100644 index 0000000..06f5f79 --- /dev/null +++ b/Task1/package.json @@ -0,0 +1,32 @@ +{ + "name": "xpk", + "version": "0.0.0", + "dependencies": {}, + "devDependencies": { + "grunt": "~0.4.1", + "grunt-contrib-copy": "~0.5.0", + "grunt-contrib-concat": "~0.3.0", + "grunt-contrib-uglify": "~0.4.0", + "grunt-contrib-jshint": "~0.9.2", + "grunt-contrib-cssmin": "~0.9.0", + "grunt-contrib-connect": "~0.7.1", + "grunt-contrib-clean": "~0.5.0", + "grunt-contrib-htmlmin": "~0.2.0", + "grunt-bower-install": "~1.4.0", + "grunt-contrib-imagemin": "~0.6.0", + "grunt-contrib-watch": "~0.6.1", + "grunt-rev": "~0.1.0", + "grunt-autoprefixer": "~0.7.2", + "grunt-usemin": "~2.1.0", + "grunt-mocha": "~0.4.10", + "grunt-newer": "~0.7.0", + "grunt-svgmin": "~0.4.0", + "grunt-concurrent": "~0.5.0", + "load-grunt-tasks": "~0.4.0", + "time-grunt": "~0.3.1", + "jshint-stylish": "~0.1.5" + }, + "engines": { + "node": ">=0.10.0" + } +} diff --git a/Task1/test/.bowerrc b/Task1/test/.bowerrc new file mode 100644 index 0000000..44491d3 --- /dev/null +++ b/Task1/test/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "bower_components" +} diff --git a/Task1/test/bower.json b/Task1/test/bower.json new file mode 100644 index 0000000..0e442d1 --- /dev/null +++ b/Task1/test/bower.json @@ -0,0 +1,9 @@ +{ + "name": "xpk", + "private": true, + "dependencies": { + "chai": "~1.8.0", + "mocha": "~1.14.0" + }, + "devDependencies": {} +} diff --git a/Task1/test/index.html b/Task1/test/index.html new file mode 100644 index 0000000..d18b7d3 --- /dev/null +++ b/Task1/test/index.html @@ -0,0 +1,27 @@ + + + + + + Mocha Spec Runner + + + +
+ + + + + + + + + + + + + diff --git a/Task1/test/spec/test.js b/Task1/test/spec/test.js new file mode 100644 index 0000000..adfd614 --- /dev/null +++ b/Task1/test/spec/test.js @@ -0,0 +1,13 @@ +/* global describe, it */ + +(function () { + 'use strict'; + + describe('Give it some context', function () { + describe('maybe a bit more context here', function () { + it('should run here few assertions', function () { + + }); + }); + }); +})(); From 695bd74136b8dd6f9b1694b90c7d01cacd2f39a7 Mon Sep 17 00:00:00 2001 From: Volodymyr Gamula Date: Wed, 28 May 2014 02:17:50 +0300 Subject: [PATCH 04/14] Added coffescript with online compilation via grunt --- Task1/Gruntfile.js | 18 +++++++++++++++ Task1/app/coffee/main.coffee | 4 ++++ Task1/app/coffee/test.coffee | 1 + Task1/app/index.html | 44 ++++++++++++++---------------------- Task1/app/scripts/main.js | 9 +++++++- Task1/app/scripts/test.js | 1 + Task1/package.json | 3 ++- 7 files changed, 51 insertions(+), 29 deletions(-) create mode 100644 Task1/app/coffee/main.coffee create mode 100644 Task1/app/coffee/test.coffee create mode 100644 Task1/app/scripts/test.js diff --git a/Task1/Gruntfile.js b/Task1/Gruntfile.js index 1b42ab9..d54ef60 100644 --- a/Task1/Gruntfile.js +++ b/Task1/Gruntfile.js @@ -40,6 +40,10 @@ module.exports = function (grunt) { livereload: true } }, + coffee: { + files: 'app/coffee/*.coffee', + tasks: ['coffee:compile'] + }, jstest: { files: ['test/spec/{,*/}*.js'], tasks: ['test:watch'] @@ -63,6 +67,20 @@ module.exports = function (grunt) { } }, + coffee: { + compile: { + options: { + bare: true + }, + expand: true, + flatten: true, + cwd: "" + __dirname + "/app/coffee/", + src: ['*.coffee'], + dest: 'app/scripts/', + ext: '.js', + } + }, + // The actual grunt server settings connect: { options: { diff --git a/Task1/app/coffee/main.coffee b/Task1/app/coffee/main.coffee new file mode 100644 index 0000000..49eacf2 --- /dev/null +++ b/Task1/app/coffee/main.coffee @@ -0,0 +1,4 @@ +'use strict' +run = -> + commands = $('#inputData').val().split('\n') + console.log commands \ No newline at end of file diff --git a/Task1/app/coffee/test.coffee b/Task1/app/coffee/test.coffee new file mode 100644 index 0000000..0069826 --- /dev/null +++ b/Task1/app/coffee/test.coffee @@ -0,0 +1 @@ +alert 'Hello!s' \ No newline at end of file diff --git a/Task1/app/index.html b/Task1/app/index.html index 441508f..675be66 100644 --- a/Task1/app/index.html +++ b/Task1/app/index.html @@ -24,36 +24,26 @@
- -

xpk

-
- -
-

'Allo, 'Allo!

-

Always a pleasure scaffolding your apps.

-

Splendid!

-
- -
-
-

HTML5 Boilerplate

-

HTML5 Boilerplate is a professional front-end template for building fast, robust, and adaptable web apps or sites.

- - - -

Bootstrap

-

Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.

- - -
+

Task 1

+
+
+ + +
+
+ + +

+
+
+ + +
+
diff --git a/Task1/app/scripts/main.js b/Task1/app/scripts/main.js index 20ca76d..494a22c 100644 --- a/Task1/app/scripts/main.js +++ b/Task1/app/scripts/main.js @@ -1 +1,8 @@ -console.log('\'Allo \'Allo!'); \ No newline at end of file +'use strict'; +var run; + +run = function() { + var commands; + commands = $('#inputData').val().split('\n'); + return console.log(commands); +}; diff --git a/Task1/app/scripts/test.js b/Task1/app/scripts/test.js new file mode 100644 index 0000000..4473fb8 --- /dev/null +++ b/Task1/app/scripts/test.js @@ -0,0 +1 @@ +alert('Hello!s'); diff --git a/Task1/package.json b/Task1/package.json index 06f5f79..96d5cb5 100644 --- a/Task1/package.json +++ b/Task1/package.json @@ -24,7 +24,8 @@ "grunt-concurrent": "~0.5.0", "load-grunt-tasks": "~0.4.0", "time-grunt": "~0.3.1", - "jshint-stylish": "~0.1.5" + "jshint-stylish": "~0.1.5", + "grunt-contrib-coffee": "~0.10.1" }, "engines": { "node": ">=0.10.0" From ee472f16af0139ec677b45cb878b44a21cde5df7 Mon Sep 17 00:00:00 2001 From: Volodymyr Gamula Date: Thu, 29 May 2014 16:43:17 +0300 Subject: [PATCH 05/14] Added simple math test --- Task1/test/spec/test.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Task1/test/spec/test.js b/Task1/test/spec/test.js index adfd614..80f9985 100644 --- a/Task1/test/spec/test.js +++ b/Task1/test/spec/test.js @@ -3,11 +3,10 @@ (function () { 'use strict'; - describe('Give it some context', function () { - describe('maybe a bit more context here', function () { - it('should run here few assertions', function () { - - }); + describe('mathematic tests', function () { + it('simple mathematic test', function () { + assert.equal(2 + 2, 4); }); }); + })(); From d1c3fdd3e11898077394d1064ff9f1dc11923c9f Mon Sep 17 00:00:00 2001 From: Volodymyr Gamula Date: Sun, 1 Jun 2014 19:07:34 +0300 Subject: [PATCH 06/14] Added tests for text parsing --- Task1/Gruntfile.js | 8 +++++- Task1/app/coffee/main.coffee | 8 ++++-- Task1/app/coffee/test.coffee | 2 +- Task1/app/scripts/main.js | 12 ++++++--- Task1/app/scripts/test.js | 4 ++- Task1/test/index.html | 3 +++ Task1/test/spec/test.js | 52 +++++++++++++++++++++++++++++++++--- 7 files changed, 77 insertions(+), 12 deletions(-) diff --git a/Task1/Gruntfile.js b/Task1/Gruntfile.js index d54ef60..08ca749 100644 --- a/Task1/Gruntfile.js +++ b/Task1/Gruntfile.js @@ -45,7 +45,7 @@ module.exports = function (grunt) { tasks: ['coffee:compile'] }, jstest: { - files: ['test/spec/{,*/}*.js'], + files: ['test/spec/{,*/}*.js', 'test/index.html'], tasks: ['test:watch'] }, gruntfile: { @@ -109,6 +109,7 @@ module.exports = function (grunt) { return [ connect.static('.tmp'), connect.static('test'), + connect().use('/scripts', connect.static('./app/scripts')), connect().use('/bower_components', connect.static('./bower_components')), connect.static(config.app) ]; @@ -156,7 +157,12 @@ module.exports = function (grunt) { mocha: { all: { options: { + scripts: [ + 'app/scripts/*.js', + 'test/spec/*.js', + ], run: true, + reporter: 'Spec', urls: ['http://<%= connect.test.options.hostname %>:<%= connect.test.options.port %>/index.html'] } } diff --git a/Task1/app/coffee/main.coffee b/Task1/app/coffee/main.coffee index 49eacf2..7e121ea 100644 --- a/Task1/app/coffee/main.coffee +++ b/Task1/app/coffee/main.coffee @@ -1,4 +1,8 @@ 'use strict' +getCommandsFromText = (string) -> + string.match(/[^\r\n]+/g) run = -> - commands = $('#inputData').val().split('\n') - console.log commands \ No newline at end of file + commands = getCommandsFromText($('#inputData').val()) + console.log commands + return +two = 2 diff --git a/Task1/app/coffee/test.coffee b/Task1/app/coffee/test.coffee index 0069826..4242551 100644 --- a/Task1/app/coffee/test.coffee +++ b/Task1/app/coffee/test.coffee @@ -1 +1 @@ -alert 'Hello!s' \ No newline at end of file +two = 2 \ No newline at end of file diff --git a/Task1/app/scripts/main.js b/Task1/app/scripts/main.js index 494a22c..f37906c 100644 --- a/Task1/app/scripts/main.js +++ b/Task1/app/scripts/main.js @@ -1,8 +1,14 @@ 'use strict'; -var run; +var getCommandsFromText, run, two; + +getCommandsFromText = function(string) { + return string.match(/[^\r\n]+/g); +}; run = function() { var commands; - commands = $('#inputData').val().split('\n'); - return console.log(commands); + commands = getCommandsFromText($('#inputData').val()); + console.log(commands); }; + +two = 2; diff --git a/Task1/app/scripts/test.js b/Task1/app/scripts/test.js index 4473fb8..4be1481 100644 --- a/Task1/app/scripts/test.js +++ b/Task1/app/scripts/test.js @@ -1 +1,3 @@ -alert('Hello!s'); +var two; + +two = 2; diff --git a/Task1/test/index.html b/Task1/test/index.html index d18b7d3..5f3a891 100644 --- a/Task1/test/index.html +++ b/Task1/test/index.html @@ -5,12 +5,15 @@ Mocha Spec Runner +
+ + diff --git a/Task1/app/scripts/ConsoleEmulator.js b/Task1/app/scripts/ConsoleEmulator.js new file mode 100644 index 0000000..0888d55 --- /dev/null +++ b/Task1/app/scripts/ConsoleEmulator.js @@ -0,0 +1,18 @@ +var ConsoleEmulator, three; + +ConsoleEmulator = (function() { + var currentPath; + + function ConsoleEmulator() {} + + currentPath = '/'; + + ConsoleEmulator.prototype.getCurrentPath = function() { + return currentPath; + }; + + return ConsoleEmulator; + +})(); + +three = 3; diff --git a/Task1/test/index.html b/Task1/test/index.html index 5f3a891..d13ade4 100644 --- a/Task1/test/index.html +++ b/Task1/test/index.html @@ -14,6 +14,7 @@ + + + diff --git a/Task1/test/spec/bdd.js b/Task1/test/spec/bdd.js new file mode 100644 index 0000000..b3bac06 --- /dev/null +++ b/Task1/test/spec/bdd.js @@ -0,0 +1,86 @@ +(function() { + 'use strict'; + describe('BDD tests', function() { + describe('String parser tests', function() { + it('Test 1 line', function() { + var commands, expected; + commands = getCommandsFromText('1'); + expected = ['1']; + expect(commands).to.be.deep.equal(expected); + }); + it('Test two lines', function() { + var commands, expected; + commands = getCommandsFromText('1\n2'); + expected = ['1', '2']; + expect(commands).to.be.deep.equal(expected); + }); + it('Test two lines #2', function() { + var commands, expected; + commands = getCommandsFromText('1\n2\n'); + expected = ['1', '2']; + expect(commands).to.be.deep.equal(expected); + }); + it('Test two lines #3', function() { + var commands, expected; + commands = getCommandsFromText('1\n2\n\n'); + expected = ['1', '2']; + expect(commands).to.be.deep.equal(expected); + }); + }); + describe('Console emulator tests', function() { + var consoleEmulator; + consoleEmulator = null; + beforeEach(function(done) { + consoleEmulator = new ConsoleEmulator(); + consoleEmulator.clear(); + done(); + }); + afterEach(function(done) { + consoleEmulator = null; + done(); + }); + it('Test current path #1', function() { + consoleEmulator.getCurrentPath().should.equal('/'); + }); + it('Test current path #2', function() { + var expected, input; + input = ['pwd']; + expected = ['/']; + expect(consoleEmulator.load(input)).to.be.deep.equal(expected); + }); + it('Optimize path test #1', function() { + expect(consoleEmulator.optimizePath('/a/../b/../c/')).to.be.deep.equal('/c/'); + }); + it('Optimize path test #2', function() { + expect(consoleEmulator.optimizePath('/a/../../b/../c/')).to.be.deep.equal('/c/'); + }); + it('Optimize path test #3', function() { + expect(consoleEmulator.optimizePath('/../../../../')).to.be.deep.equal('/'); + }); + it('Real test #1', function() { + var expected, input; + input = ['pwd', 'pwd']; + expected = ['/', '/']; + expect(consoleEmulator.load(input)).to.be.deep.equal(expected); + }); + it('Real test #2', function() { + var expected, input; + input = ['cd vasa', 'pwd']; + expected = ['/vasa/']; + expect(consoleEmulator.load(input)).to.be.deep.equal(expected); + }); + it('Real test #3', function() { + var expected, input; + input = ['pwd', 'cd /home/vasya', 'pwd', 'cd ..', 'pwd', 'cd vasya/../petya', 'pwd']; + expected = ['/', '/home/vasya/', '/home/', '/home/petya/']; + expect(consoleEmulator.load(input)).to.be.deep.equal(expected); + }); + it('Real test #4', function() { + var expected, input; + input = ['cd /a/b', 'pwd', 'cd ../a/b', 'pwd']; + expected = ['/a/b/', '/a/a/b/']; + expect(consoleEmulator.load(input)).to.be.deep.equal(expected); + }); + }); + }); +})(); diff --git a/Task1/test/spec/tdd.js b/Task1/test/spec/tdd.js new file mode 100644 index 0000000..745ea14 --- /dev/null +++ b/Task1/test/spec/tdd.js @@ -0,0 +1,94 @@ +(function() { + 'use strict'; + describe('TDD tests', function() { + describe('Math tests', function() { + it('Simple sum test', function() { + assert.equal(2 + 2, 4); + }); + it('Pow test', function() { + assert.equal(Math.pow(2, 2), 4); + }); + }); + describe('String parser tests', function() { + it('Test 1 line', function() { + var commands, expected; + commands = getCommandsFromText('1'); + expected = ['1']; + assert.deepEqual(commands, expected); + }); + it('Test two lines', function() { + var commands, expected; + commands = getCommandsFromText('1\n2'); + expected = ['1', '2']; + assert.deepEqual(commands, expected); + }); + it('Test two lines #2', function() { + var commands, expected; + commands = getCommandsFromText('1\n2\n'); + expected = ['1', '2']; + assert.deepEqual(commands, expected); + }); + it('Test two lines #3', function() { + var commands, expected; + commands = getCommandsFromText('1\n2\n\n'); + expected = ['1', '2']; + assert.deepEqual(commands, expected); + }); + }); + describe('Console emulator tests', function() { + var consoleEmulator; + consoleEmulator = null; + beforeEach(function(done) { + consoleEmulator = new ConsoleEmulator(); + consoleEmulator.clear(); + done(); + }); + afterEach(function(done) { + consoleEmulator = null; + done(); + }); + it('Test current path #1', function() { + assert.equal(consoleEmulator.getCurrentPath(), '/'); + }); + it('Test current path #2', function() { + var expected, input; + input = ['pwd']; + expected = ['/']; + assert.deepEqual(consoleEmulator.load(input), expected); + }); + it('Optimize path test #1', function() { + assert.equal(consoleEmulator.optimizePath('/a/../b/../c/'), '/c/'); + }); + it('Optimize path test #2', function() { + assert.equal(consoleEmulator.optimizePath('/a/../../b/../c/'), '/c/'); + }); + it('Optimize path test #3', function() { + assert.equal(consoleEmulator.optimizePath('/../../../../'), '/'); + }); + it('Real test #1', function() { + var expected, input; + input = ['pwd', 'pwd']; + expected = ['/', '/']; + assert.deepEqual(consoleEmulator.load(input), expected); + }); + it('Real test #2', function() { + var expected, input; + input = ['cd vasa', 'pwd']; + expected = ['/vasa/']; + assert.deepEqual(consoleEmulator.load(input), expected); + }); + it('Real test #3', function() { + var expected, input; + input = ['pwd', 'cd /home/vasya', 'pwd', 'cd ..', 'pwd', 'cd vasya/../petya', 'pwd']; + expected = ['/', '/home/vasya/', '/home/', '/home/petya/']; + assert.deepEqual(consoleEmulator.load(input), expected); + }); + it('Real test #4', function() { + var expected, input; + input = ['cd /a/b', 'pwd', 'cd ../a/b', 'pwd']; + expected = ['/a/b/', '/a/a/b/']; + assert.deepEqual(consoleEmulator.load(input), expected); + }); + }); + }); +})(); diff --git a/Task1/test/spec/test.js b/Task1/test/spec/test.js deleted file mode 100644 index f629c43..0000000 --- a/Task1/test/spec/test.js +++ /dev/null @@ -1,288 +0,0 @@ -/* global describe, it */ - -(function () { - 'use strict'; - - //var test = require('./../app/scripts/test.js'); - - describe('TDD tests', function(){ - - describe('Mathematics tests', function () { - - it('simple sum test', function () { - assert.equal(2 + 2, 4); - }); - - it('pow test', function() { - assert.equal(Math.pow(2,2), 4); - }); - }); - - describe('String parser tests', function() { - - it('Test 1 line', function() { - var commands = getCommandsFromText('1'); - var expected = ['1']; - assert.deepEqual(commands, expected); - }); - - it('Test two lines', function() { - var commands = getCommandsFromText('1\n2'); - var expected = [ - '1', - '2' - ]; - assert.deepEqual(commands, expected); - }); - it('Test two lines #2', function() { - var commands = getCommandsFromText('1\n2\n'); - var expected = [ - '1', - '2' - ]; - assert.deepEqual(commands, expected); - }); - it('Test two lines #3', function() { - var commands = getCommandsFromText('1\n2\n\n'); - var expected = [ - '1', - '2' - ]; - assert.deepEqual(commands, expected); - }); - }); - - describe('Console emulator tests', function() { - var consoleEmulator; - - beforeEach(function(done){ - consoleEmulator = new ConsoleEmulator(); - consoleEmulator.clear(); - done(); - }); - - afterEach(function(done){ - consoleEmulator = null; - done(); - }); - - it('Test current path #1', function() { - assert.equal(consoleEmulator.getCurrentPath(), '/'); - }) - - it('Test current path #2', function() { - var input = [ - 'pwd' - ]; - var expected = [ - '/' - ]; - assert.deepEqual(consoleEmulator.load(input), expected); - }); - - it('Optimize path test #1' , function() { - assert.equal(consoleEmulator.optimizePath('/a/../b/../c/'), '/c/'); - }); - - it('Optimize path test #2' , function() { - assert.equal(consoleEmulator.optimizePath('/a/../../b/../c/'), '/c/'); - }); - - it('Optimize path test #3' , function() { - assert.equal(consoleEmulator.optimizePath('/../../../../'), '/'); - }); - - it('Real test #1', function() { - var input = [ - 'pwd', - 'pwd' - ]; - var expected = [ - '/', - '/' - ]; - assert.deepEqual(consoleEmulator.load(input), expected); - }); - - it('Real test #2', function() { - var input = [ - 'cd vasa', - 'pwd' - ]; - var expected = [ - '/vasa/' - ]; - assert.deepEqual(consoleEmulator.load(input), expected); - }); - - it('Real test #3', function() { - var input = [ - 'pwd', - 'cd /home/vasya', - 'pwd', - 'cd ..', - 'pwd', - 'cd vasya/../petya', - 'pwd' - ]; - var expected = [ - '/', - '/home/vasya/', - '/home/', - '/home/petya/' - ]; - assert.deepEqual(consoleEmulator.load(input), expected); - }); - - - it('Real test #4', function() { - var input = [ - 'cd /a/b', - 'pwd', - 'cd ../a/b', - 'pwd' - ]; - var expected = [ - '/a/b/', - '/a/a/b/' - ]; - assert.deepEqual(consoleEmulator.load(input), expected); - }); - }); - }); - - describe('BDD tests', function(){ - - describe('String parser tests', function() { - - it('Test 1 line', function() { - var commands = getCommandsFromText('1'); - var expected = ['1']; - expect(commands).to.be.deep.equal(expected); - }); - - it('Test two lines', function() { - var commands = getCommandsFromText('1\n2'); - var expected = [ - '1', - '2' - ]; - expect(commands).to.be.deep.equal(expected); - }); - it('Test two lines #2', function() { - var commands = getCommandsFromText('1\n2\n'); - var expected = [ - '1', - '2' - ]; - expect(commands).to.be.deep.equal(expected); - }); - it('Test two lines #3', function() { - var commands = getCommandsFromText('1\n2\n\n'); - var expected = [ - '1', - '2' - ]; - expect(commands).to.be.deep.equal(expected); - }); - }); - - describe('Console emulator tests', function() { - var consoleEmulator; - - beforeEach(function(done){ - consoleEmulator = new ConsoleEmulator(); - consoleEmulator.clear(); - done(); - }); - - afterEach(function(done){ - consoleEmulator = null; - done(); - }); - - it('Test current path #1', function() { - consoleEmulator.getCurrentPath().should.equal('/'); - }) - - it('Test current path #2', function() { - var input = [ - 'pwd' - ]; - var expected = [ - '/' - ]; - expect(consoleEmulator.load(input)).to.be.deep.equal(expected); - }); - - it('Optimize path test #1' , function() { - expect(consoleEmulator.optimizePath('/a/../b/../c/')).to.be.deep.equal('/c/'); - }); - - it('Optimize path test #2' , function() { - expect(consoleEmulator.optimizePath('/a/../../b/../c/')).to.be.deep.equal('/c/'); - }); - - it('Optimize path test #3' , function() { - expect(consoleEmulator.optimizePath('/../../../../')).to.be.deep.equal('/'); - }); - - it('Real test #1', function() { - var input = [ - 'pwd', - 'pwd' - ]; - var expected = [ - '/', - '/' - ]; - expect(consoleEmulator.load(input)).to.be.deep.equal(expected); - }); - - it('Real test #2', function() { - var input = [ - 'cd vasa', - 'pwd' - ]; - var expected = [ - '/vasa/' - ]; - expect(consoleEmulator.load(input)).to.be.deep.equal(expected); - }); - - it('Real test #3', function() { - var input = [ - 'pwd', - 'cd /home/vasya', - 'pwd', - 'cd ..', - 'pwd', - 'cd vasya/../petya', - 'pwd' - ]; - var expected = [ - '/', - '/home/vasya/', - '/home/', - '/home/petya/' - ]; - expect(consoleEmulator.load(input)).to.be.deep.equal(expected); - }); - - - it('Real test #4', function() { - var input = [ - 'cd /a/b', - 'pwd', - 'cd ../a/b', - 'pwd' - ]; - var expected = [ - '/a/b/', - '/a/a/b/' - ]; - expect(consoleEmulator.load(input)).to.be.deep.equal(expected); - }); - }); - }); -})(); From f5778f10ea0a0337c8622b5866d092e431282af3 Mon Sep 17 00:00:00 2001 From: Volodymyr Gamula Date: Mon, 2 Jun 2014 20:28:13 +0300 Subject: [PATCH 13/14] Added cucumber bdd specs --- Task1/Gruntfile.js | 11 +- Task1/README.md | 7 +- Task1/app/coffee/main.coffee | 3 +- Task1/app/index.html | 2 +- Task1/features/functional.feature | 30 +++++ .../step_definitions/functional.step.js | 47 ++++++++ Task1/features/support/world.js | 11 ++ Task1/package.json | 4 +- Task1/test/coffee/tdd.coffee | 108 ------------------ Task1/test/coffee/{bdd.coffee => unit.coffee} | 0 Task1/test/index.html | 3 +- Task1/test/spec/tdd.js | 94 --------------- Task1/test/spec/{bdd.js => unit.js} | 0 13 files changed, 109 insertions(+), 211 deletions(-) create mode 100644 Task1/features/functional.feature create mode 100644 Task1/features/step_definitions/functional.step.js create mode 100644 Task1/features/support/world.js delete mode 100644 Task1/test/coffee/tdd.coffee rename Task1/test/coffee/{bdd.coffee => unit.coffee} (100%) delete mode 100644 Task1/test/spec/tdd.js rename Task1/test/spec/{bdd.js => unit.js} (100%) diff --git a/Task1/Gruntfile.js b/Task1/Gruntfile.js index 1b5affa..d42bb6f 100644 --- a/Task1/Gruntfile.js +++ b/Task1/Gruntfile.js @@ -48,6 +48,10 @@ module.exports = function (grunt) { files: ['test/coffee/*.coffee'], tasks: ['coffee:compileTests'] }, + features: { + files: ['features/*.feature', 'features/step_definitions/*.js'], + tasks: ['cucumberjs'] + }, jstest: { files: ['test/spec/{,*/}*.js', 'test/index.html'], tasks: ['test:watch'] @@ -70,7 +74,12 @@ module.exports = function (grunt) { ] } }, - + cucumberjs: { + src: 'features/features', + options: { + steps: "features/step_definitions" + } + }, coffee: { compile: { options: { diff --git a/Task1/README.md b/Task1/README.md index 71b7501..7745a2e 100644 --- a/Task1/README.md +++ b/Task1/README.md @@ -6,11 +6,12 @@ This is a project, which realizes [this task]. [demo] Project was written with using next instruments: + - [Bower] - [Grunt] - [Coffescript] - [Mocha] test runner - [Chai] test instruments - + - [Cucumber] test instrument for BDD Specs Version @@ -23,12 +24,14 @@ License [MIT] -**Free Software, Hell Yeah!** +** [this task]: https://github.com/ftrrtf/xpk/blob/master/task1/desc.md [Grunt]: http://gruntjs.com +[Bower]: http://bower.io [Coffescript]: http://coffeescript.org/ [Mocha]: http://visionmedia.github.io/mocha/ [Chai]: http://chaijs.com/ [node.js]: http://nodejs.org [MIT]: http://opensource.org/licenses/MIT [demo]: https://vgamula.github.io/console/ +[Cucumber]: https://github.com/cucumber/cucumber-js \ No newline at end of file diff --git a/Task1/app/coffee/main.coffee b/Task1/app/coffee/main.coffee index f465234..f217d6c 100644 --- a/Task1/app/coffee/main.coffee +++ b/Task1/app/coffee/main.coffee @@ -8,5 +8,4 @@ run = -> consoleEmulator = new ConsoleEmulator result = consoleEmulator.load(commands) $('#outputData').val(result.join('\n')); - return - + return \ No newline at end of file diff --git a/Task1/app/index.html b/Task1/app/index.html index b70e831..aa5ed9d 100644 --- a/Task1/app/index.html +++ b/Task1/app/index.html @@ -9,7 +9,7 @@ - + diff --git a/Task1/features/functional.feature b/Task1/features/functional.feature new file mode 100644 index 0000000..85d484b --- /dev/null +++ b/Task1/features/functional.feature @@ -0,0 +1,30 @@ +Feature: Example feature + I want to use Cucumber.js as a test tool + + Scenario: Visiting site and checking title + Given I am on the start page + Then I should see "xpk" as the page title + + Scenario: Test #1 + Given I am on the start page + Then I pass "pwd" into input + Then I click on the run button + Then I see "/" in output + + Scenario: Test #2 + Given I am on the start page + Then I pass "pwd\npwd\npwd" into input + Then I click on the run button + Then I see "/\n/\n/" in output + + Scenario: Real test #1 + Given I am on the start page + Then I pass "pwd\ncd /home/vasya\npwd\ncd ..\npwd\ncd vasya/../petya\npwd" into input + Then I click on the run button + Then I see "/\n/home/vasya/\n/home/\n/home/petya/" in output + + Scenario: Real test #2 + Given I am on the start page + Then I pass "cd /a/b\npwd\ncd ../a/b\npwd" into input + Then I click on the run button + Then I see "/a/b/\n/a/a/b/" in output diff --git a/Task1/features/step_definitions/functional.step.js b/Task1/features/step_definitions/functional.step.js new file mode 100644 index 0000000..da48c0e --- /dev/null +++ b/Task1/features/step_definitions/functional.step.js @@ -0,0 +1,47 @@ +var assert = require('assert'); + +function replaceAll(str, find, replace) { + if (str.indexOf(find) != -1) { + return str.split(find).join(replace); + } else { + return str; + } +} + +var myStepDefinitionsWrapper = function () { + this.World = require("../support/world.js").World; + + this.Given(/^I am on the start page$/, function(callback) { + this.visit('http://vgamula.github.io/console/', callback); + }); + + this.Then(/^I pass "(.*)" into input$/, function(arg1, callback) { + arg1 = replaceAll(arg1, "\\n", '\n'); + this.browser.fill("inputData", arg1); + callback(); + }); + + this.Then(/^I should see "(.*)" as the page title$/, function(title, callback) { + var pageTitle = this.browser.text('title'); + if (title === pageTitle) { + callback(); + } else { + callback.fail(new Error("Expected to be on page with title " + title)); + } + }); + + this.Then(/^I click on the run button$/, function(callback){ + this.browser.pressButton("btn", function(){}); + callback(); + }); + + this.Then(/^I see "([^]*)" in output$/, function(arg1, callback){ + arg1 = replaceAll(arg1, "\\n", '\n'); + var output = this.browser.document.getElementById('outputData'); + assert.equal(arg1, output.value); + callback(); + }); + +}; + +module.exports = myStepDefinitionsWrapper; \ No newline at end of file diff --git a/Task1/features/support/world.js b/Task1/features/support/world.js new file mode 100644 index 0000000..e8699e4 --- /dev/null +++ b/Task1/features/support/world.js @@ -0,0 +1,11 @@ +var zombie = require('zombie'); +var World = function World(callback) { + this.browser = new zombie(); + + this.visit = function(url, callback) { + this.browser.visit(url, callback); + }; + + callback(); +}; +exports.World = World; \ No newline at end of file diff --git a/Task1/package.json b/Task1/package.json index 96d5cb5..67e6d66 100644 --- a/Task1/package.json +++ b/Task1/package.json @@ -25,7 +25,9 @@ "load-grunt-tasks": "~0.4.0", "time-grunt": "~0.3.1", "jshint-stylish": "~0.1.5", - "grunt-contrib-coffee": "~0.10.1" + "grunt-contrib-coffee": "~0.10.1", + "cucumber": "~0.4.0", + "grunt-cucumber": "~0.2.3" }, "engines": { "node": ">=0.10.0" diff --git a/Task1/test/coffee/tdd.coffee b/Task1/test/coffee/tdd.coffee deleted file mode 100644 index f9b01bd..0000000 --- a/Task1/test/coffee/tdd.coffee +++ /dev/null @@ -1,108 +0,0 @@ -(-> - 'use strict' - - describe 'TDD tests', -> - - describe 'Math tests', -> - - it 'Simple sum test', -> - assert.equal 2+2, 4 - return - - it 'Pow test', -> - assert.equal Math.pow(2, 2), 4 - return - return - - describe 'String parser tests', -> - - it 'Test 1 line', -> - commands = getCommandsFromText '1' - expected = ['1'] - assert.deepEqual commands, expected; - return - - it 'Test two lines', -> - commands = getCommandsFromText '1\n2' - expected = ['1','2']; - assert.deepEqual commands, expected; - return - - it 'Test two lines #2', -> - commands = getCommandsFromText '1\n2\n' - expected = ['1','2']; - assert.deepEqual commands, expected; - return - - it 'Test two lines #3', -> - commands = getCommandsFromText '1\n2\n\n' - expected = ['1','2']; - assert.deepEqual commands, expected; - return - return - - describe 'Console emulator tests', -> - consoleEmulator = null - - beforeEach (done) -> - consoleEmulator = new ConsoleEmulator() - consoleEmulator.clear() - done() - return - - afterEach (done) -> - consoleEmulator = null - done() - return - - it 'Test current path #1', -> - assert.equal consoleEmulator.getCurrentPath() , '/' - return - - it 'Test current path #2', -> - input = ['pwd']; - expected = ['/']; - assert.deepEqual consoleEmulator.load(input) , expected - return - - it 'Optimize path test #1', -> - assert.equal consoleEmulator.optimizePath('/a/../b/../c/'), '/c/' - return - - it 'Optimize path test #2', -> - assert.equal consoleEmulator.optimizePath('/a/../../b/../c/'), '/c/' - return - - it 'Optimize path test #3', -> - assert.equal consoleEmulator.optimizePath('/../../../../'), '/' - return - - it 'Real test #1', -> - input = ['pwd', 'pwd'] - expected = ['/', '/'] - assert.deepEqual consoleEmulator.load(input), expected; - return - - it 'Real test #2', -> - input = ['cd vasa', 'pwd'] - expected = ['/vasa/'] - assert.deepEqual consoleEmulator.load(input), expected; - return - - it 'Real test #3', -> - input = ['pwd', 'cd /home/vasya', 'pwd', 'cd ..', 'pwd', 'cd vasya/../petya', 'pwd'] - expected = ['/', '/home/vasya/', '/home/', '/home/petya/'] - assert.deepEqual consoleEmulator.load(input), expected; - return - - it 'Real test #4', -> - input = ['cd /a/b', 'pwd', 'cd ../a/b', 'pwd'] - expected = ['/a/b/', '/a/a/b/'] - assert.deepEqual consoleEmulator.load(input), expected; - return - return - - return - - return - )() \ No newline at end of file diff --git a/Task1/test/coffee/bdd.coffee b/Task1/test/coffee/unit.coffee similarity index 100% rename from Task1/test/coffee/bdd.coffee rename to Task1/test/coffee/unit.coffee diff --git a/Task1/test/index.html b/Task1/test/index.html index 799c5d5..22fb5d8 100644 --- a/Task1/test/index.html +++ b/Task1/test/index.html @@ -24,8 +24,7 @@ - - + diff --git a/Task1/test/spec/tdd.js b/Task1/test/spec/tdd.js deleted file mode 100644 index 745ea14..0000000 --- a/Task1/test/spec/tdd.js +++ /dev/null @@ -1,94 +0,0 @@ -(function() { - 'use strict'; - describe('TDD tests', function() { - describe('Math tests', function() { - it('Simple sum test', function() { - assert.equal(2 + 2, 4); - }); - it('Pow test', function() { - assert.equal(Math.pow(2, 2), 4); - }); - }); - describe('String parser tests', function() { - it('Test 1 line', function() { - var commands, expected; - commands = getCommandsFromText('1'); - expected = ['1']; - assert.deepEqual(commands, expected); - }); - it('Test two lines', function() { - var commands, expected; - commands = getCommandsFromText('1\n2'); - expected = ['1', '2']; - assert.deepEqual(commands, expected); - }); - it('Test two lines #2', function() { - var commands, expected; - commands = getCommandsFromText('1\n2\n'); - expected = ['1', '2']; - assert.deepEqual(commands, expected); - }); - it('Test two lines #3', function() { - var commands, expected; - commands = getCommandsFromText('1\n2\n\n'); - expected = ['1', '2']; - assert.deepEqual(commands, expected); - }); - }); - describe('Console emulator tests', function() { - var consoleEmulator; - consoleEmulator = null; - beforeEach(function(done) { - consoleEmulator = new ConsoleEmulator(); - consoleEmulator.clear(); - done(); - }); - afterEach(function(done) { - consoleEmulator = null; - done(); - }); - it('Test current path #1', function() { - assert.equal(consoleEmulator.getCurrentPath(), '/'); - }); - it('Test current path #2', function() { - var expected, input; - input = ['pwd']; - expected = ['/']; - assert.deepEqual(consoleEmulator.load(input), expected); - }); - it('Optimize path test #1', function() { - assert.equal(consoleEmulator.optimizePath('/a/../b/../c/'), '/c/'); - }); - it('Optimize path test #2', function() { - assert.equal(consoleEmulator.optimizePath('/a/../../b/../c/'), '/c/'); - }); - it('Optimize path test #3', function() { - assert.equal(consoleEmulator.optimizePath('/../../../../'), '/'); - }); - it('Real test #1', function() { - var expected, input; - input = ['pwd', 'pwd']; - expected = ['/', '/']; - assert.deepEqual(consoleEmulator.load(input), expected); - }); - it('Real test #2', function() { - var expected, input; - input = ['cd vasa', 'pwd']; - expected = ['/vasa/']; - assert.deepEqual(consoleEmulator.load(input), expected); - }); - it('Real test #3', function() { - var expected, input; - input = ['pwd', 'cd /home/vasya', 'pwd', 'cd ..', 'pwd', 'cd vasya/../petya', 'pwd']; - expected = ['/', '/home/vasya/', '/home/', '/home/petya/']; - assert.deepEqual(consoleEmulator.load(input), expected); - }); - it('Real test #4', function() { - var expected, input; - input = ['cd /a/b', 'pwd', 'cd ../a/b', 'pwd']; - expected = ['/a/b/', '/a/a/b/']; - assert.deepEqual(consoleEmulator.load(input), expected); - }); - }); - }); -})(); diff --git a/Task1/test/spec/bdd.js b/Task1/test/spec/unit.js similarity index 100% rename from Task1/test/spec/bdd.js rename to Task1/test/spec/unit.js From 7257c424d5e909998e1ff48a96a757dd25e78f7e Mon Sep 17 00:00:00 2001 From: Volodymyr Gamula Date: Tue, 3 Jun 2014 02:03:00 +0300 Subject: [PATCH 14/14] Little fix: changed getCommandsFromText logic, added private clear method --- Task1/app/coffee/ConsoleEmulator.coffee | 8 ++++++-- Task1/app/coffee/main.coffee | 2 +- Task1/app/index.html | 7 +++---- Task1/app/scripts/ConsoleEmulator.js | 9 +++++++-- Task1/app/scripts/main.js | 2 +- Task1/features/step_definitions/functional.step.js | 2 +- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Task1/app/coffee/ConsoleEmulator.coffee b/Task1/app/coffee/ConsoleEmulator.coffee index dc7e40b..159c2ef 100644 --- a/Task1/app/coffee/ConsoleEmulator.coffee +++ b/Task1/app/coffee/ConsoleEmulator.coffee @@ -9,9 +9,13 @@ class ConsoleEmulator currentPath = privateOptimizePath(path) + '/' return - clear: -> + privateClear = -> currentPath = '/' + clear: -> + privateClear() + return + privateOptimizePath = (path) -> items = path.split '/' loop @@ -26,7 +30,6 @@ class ConsoleEmulator optimizePath: (path) -> privateOptimizePath(path) - load: (items) -> output = [] for item in items @@ -37,5 +40,6 @@ class ConsoleEmulator if path[0] isnt '/' path = currentPath + path changeDirectory(path) + privateClear() output diff --git a/Task1/app/coffee/main.coffee b/Task1/app/coffee/main.coffee index f217d6c..ce844be 100644 --- a/Task1/app/coffee/main.coffee +++ b/Task1/app/coffee/main.coffee @@ -1,7 +1,7 @@ 'use strict' getCommandsFromText = (string) -> - string.match(/[^\r\n]+/g) + string.match(/[^\r\n]+/g) or [] run = -> commands = getCommandsFromText($('#inputData').val()) diff --git a/Task1/app/index.html b/Task1/app/index.html index aa5ed9d..d8b4d99 100644 --- a/Task1/app/index.html +++ b/Task1/app/index.html @@ -30,16 +30,15 @@

Task 1

- +
- -

+

- +