From 15011d0d2ca188140488c1b34ba2485f804616c5 Mon Sep 17 00:00:00 2001 From: fununloaded Date: Thu, 21 Apr 2016 06:17:50 +0000 Subject: [PATCH] iteration4-1 --- Gemfile | 1 - app/assets/javascripts/application.js | 1 - coverage/.last_run.json | 2 +- coverage/.resultset.json | 7 +- coverage/index.html | 5050 ++++++++--------- .../edit_application_deadline.feature | 37 + .../edit_application_form.feature | 52 + .../edit_static_page.feature | 26 + .../email_confirmation.feature | 15 + features/login_tests/password_reset.feature | 17 + features/step_definitions/custom_steps.rb | 4 + 11 files changed, 2600 insertions(+), 2612 deletions(-) create mode 100644 features/admin_portal_tests/edit_application_deadline.feature create mode 100644 features/admin_portal_tests/edit_application_form.feature create mode 100644 features/admin_portal_tests/edit_static_page.feature create mode 100644 features/applicant_portal_tests/email_confirmation.feature create mode 100644 features/login_tests/password_reset.feature diff --git a/Gemfile b/Gemfile index 16fe0b3..ef381a8 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,6 @@ gem 'coffee-rails', '~> 4.1.0' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby gem 'coveralls', require: false - # Use jquery as the JavaScript library gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 1662961..c6d4fd8 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,6 +12,5 @@ // //= require jquery //= require jquery_ujs -//= require turbolinks //= require bootstrap //= require_tree . diff --git a/coverage/.last_run.json b/coverage/.last_run.json index 53e54dc..be71f03 100644 --- a/coverage/.last_run.json +++ b/coverage/.last_run.json @@ -1,5 +1,5 @@ { "result": { - "covered_percent": 84.51 + "covered_percent": 96.24 } } diff --git a/coverage/.resultset.json b/coverage/.resultset.json index 8a90072..686d0a9 100644 --- a/coverage/.resultset.json +++ b/coverage/.resultset.json @@ -1243,6 +1243,7 @@ null, null, null, + 1, null, null, null, @@ -1880,7 +1881,7 @@ null, null, 1, - 828, + 913, null, null, 1, @@ -1936,7 +1937,7 @@ null, 1, 1, - 32, + 35, 0, 0, null, @@ -2175,6 +2176,6 @@ null ] }, - "timestamp": 1460785768 + "timestamp": 1461210386 } } diff --git a/coverage/index.html b/coverage/index.html index 154d189..5b33771 100644 --- a/coverage/index.html +++ b/coverage/index.html @@ -5,7 +5,7 @@ - + @@ -14,27 +14,27 @@ loading