Skip to content

Commit

Permalink
[#76864570] data consistency report without database foreign keys
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

commit 870d5bf
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 15 11:33:14 2014 +0200

    consistency report without database foreign keys

commit 1901cd0
Merge: d7c469d 322512a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 12 15:53:01 2014 +0200

    Merge branch 'master' into fs_consistency_report

    Conflicts:
    	Gemfile.lock
    	cider-ci/tasks/cucumber.yml
    	cider-ci/tasks/cucumber_scenarios.yml
    	cider-ci/tasks/cucumber_strict.yml
    	features/personas/dumps/minimal_seed.sql

commit d7c469d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 12 15:41:39 2014 +0200

    consistency report with delete interactions

commit c1b3b32
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 12:57:18 2014 +0200

    upgrading to Rails 4.0.9

commit 57860fd
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 10 15:27:36 2014 +0200

    catch exception on foreign keys migration

commit 24d231c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 10 09:46:06 2014 +0200

    regenerating dumps

commit ec7eeea
Merge: 7c892aa 7cc679d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 10 09:44:46 2014 +0200

    Merge branch 'fix_3_trials' of github.com:zhdk/leihs into fs_consistency_report

    Conflicts:
    	cider-ci/tasks/cucumber.yml
    	cider-ci/tasks/cucumber_scenarios.yml
    	cider-ci/tasks/cucumber_strict.yml
    	features/personas/dumps/minimal_seed.sql

commit 7cc679d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 17:49:41 2014 +0200

    inventarhelfer steps fix

commit 30f6295
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 17:42:57 2014 +0200

    fix kalender.feature

commit 7c892aa
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 9 16:52:03 2014 +0200

    fix typo

commit 6c65a55
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 9 16:41:23 2014 +0200

    adapting rspec syntax

commit d2a8bf9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 16:23:30 2014 +0200

    fix paket item inventory helfer test

commit 48431db
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 9 15:53:06 2014 +0200

    fix consistency interaction

commit 7aeb3e7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 15:28:02 2014 +0200

    fix features/step_definitions/examples/kalendar_steps.rb

commit 6a30688
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 14:41:25 2014 +0200

    fix features/borrow/vorlagen.feature:45

commit 33a7f87
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 12:01:11 2014 +0200

    fix features/examples/ausleihe.feature:79

commit 73f0888
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 11:52:23 2014 +0200

    fix hand over add.feature

commit d588f28
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 10:59:39 2014 +0200

    auto_trials: 2 inside of the generation script

commit 2b4b74f
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 10:59:18 2014 +0200

    regenerate scenario tasks with auto_trials: 2

commit 5ac466c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 9 10:44:31 2014 +0200

    regenerating dumps

commit eebc882
Merge: 98ba646 7e275d4
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 9 10:42:33 2014 +0200

    merging master into fs_consistency_report

commit 98ba646
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 8 17:41:51 2014 +0200

    define inverse associations needed for consistency report

commit 53bc696
Merge: 5788ff0 b12c910
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 8 17:27:43 2014 +0200

    Merge branch 'making_CI_green' of github.com:zhdk/leihs into fs_consistency_report

commit b12c910
Merge: 5bed90b b18efd7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 8 17:23:42 2014 +0200

    Merge branch 'master' into making_CI_green

commit 5bed90b
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 8 16:59:01 2014 +0200

    [FIX CI]

commit b3c3178
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 8 16:31:55 2014 +0200

    [FIX CI] @Firefox tag

commit bcd1bd2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 8 16:06:53 2014 +0200

    [BUGFIX] show timeline also for a software line

commit 5788ff0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 8 15:43:18 2014 +0200

    regenerating dumps

commit 16a3d22
Merge: cfa9b15 c163057
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 8 15:40:08 2014 +0200

    Merge branch 'making_CI_green' of github.com:zhdk/leihs into fs_consistency_report

commit c163057
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 8 15:39:10 2014 +0200

    change investment to Investition in gegenstand erstellen feature

commit cfa9b15
Merge: 6efdda8 e2f4aa1
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 8 15:37:04 2014 +0200

    Merge branch 'making_CI_green' of github.com:zhdk/leihs into fs_consistency_report

commit e2f4aa1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 8 15:35:55 2014 +0200

    [FIX TEST] availability checks in manage booking calendar

commit a07c318
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 8 15:35:27 2014 +0200

    travel in time in frontend when starting server with specific test dump

commit b97a755
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 8 15:35:03 2014 +0200

    [BUGFIX] availability coffee withoutLines() consider soft overbooking

commit 6efdda8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 8 12:16:02 2014 +0200

    [FIX CI] foreign keys cascading

commit e5f60a2
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 5 15:09:41 2014 +0200

    [FIX CI] timeout countdown

commit 4f4998f
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 5 14:29:33 2014 +0200

    regenerated dumps

commit 35a3388
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 5 14:26:29 2014 +0200

    [FIX CI]

commit 6a77418
Merge: 5cbea9a 5dfebc2
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 5 14:23:34 2014 +0200

    Merge branch 'making_CI_green' of github.com:zhdk/leihs into fs_consistency_report

commit 5dfebc2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 5 13:42:05 2014 +0200

    fix gegenstand features

commit 5cbea9a
Merge: e36c276 76333f5
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 5 12:39:22 2014 +0200

    Merge branch 'making_CI_green' of github.com:zhdk/leihs into fs_consistency_report

    Conflicts:
    	features/personas/dumps/minimal_seed.sql

commit e36c276
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 5 12:37:08 2014 +0200

    foreign keys with cascading

commit 76333f5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 5 12:16:48 2014 +0200

    regenerate dumps

commit 1289b6a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 5 12:10:19 2014 +0200

    [FIX CI] item/package steps

commit 17ce548
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 5 11:36:46 2014 +0200

    fix steps

commit b144104
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 5 11:36:33 2014 +0200

    regenerate dumps

commit ea7dafc
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 5 11:36:12 2014 +0200

    fix visit / visit lines migrations

commit 5623320
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 4 17:48:12 2014 +0200

    introducing sql foreign keys

commit 3d42dd6
Merge: 65dfca8 aa6190e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 4 17:44:31 2014 +0200

    Merge branch 'making_CI_green' of github.com:zhdk/leihs into fs_consistency_report

commit dd966c7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 4 16:52:51 2014 +0200

    [BUGFIX] matches(x) instead of eq(x) in contract.rb

commit aa6190e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 4 15:15:50 2014 +0200

    prepare dumps

commit a5c58b5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 4 15:13:46 2014 +0200

    [FIX CI] gegenstand_editiere.feature

commit c7deb14
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 4 15:13:22 2014 +0200

    fix all owner_ids in fixtures

commit 109869f
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 4 14:27:58 2014 +0200

    [FIX CI] ausleihe.feature

commit a98617e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 4 12:28:08 2014 +0200

    properly check for existence of deferred objects

commit ec07dd9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 4 09:50:58 2014 +0200

    fix missing owner_id for a item in fixtures

commit 33df6ea
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 4 09:50:42 2014 +0200

    prepare personas dumps

commit 65819d8
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 4 09:46:13 2014 +0200

    should -> expect

commit b78fd4e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 3 16:39:12 2014 +0200

    fix hand over travel time

commit 65dfca8
Merge: ca542d8 e28ae1b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 3 12:40:39 2014 +0200

    Merge branch 'making_CI_green' of github.com:zhdk/leihs into fs_consistency_report

commit e28ae1b
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 3 12:27:13 2014 +0200

    add firefox tag to modell.feature test

commit aad3b25
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 3 11:05:13 2014 +0200

    Remove comment for fixed issue

commit ff053be
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 3 11:04:25 2014 +0200

    fix submitAssignment with :enter in hand over page

commit 541a0da
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 3 11:04:05 2014 +0200

    optimize sign contract step

commit 72856b8
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 3 09:19:12 2014 +0200

    initializer for runing dev server with a specific test dump

commit ca542d8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 2 17:35:49 2014 +0200

    database consistency report

commit 422952f
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 2 15:36:57 2014 +0200

    removing fake location association from option, just used on the picking_list

commit 173b0b0
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 2 15:31:20 2014 +0200

    [FIX CI] features/manage/delegation.feature:194

commit 23af9d6
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 2 15:01:57 2014 +0200

    [FIX CI] features/examples/inventar.feature:248

commit 80a28f4
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 2 14:28:23 2014 +0200

    removing @current tag from scenarios
  • Loading branch information
Franco Sellitto committed Sep 15, 2014
1 parent 322512a commit 3cb4b3e
Show file tree
Hide file tree
Showing 78 changed files with 9,543 additions and 12,507 deletions.
7 changes: 3 additions & 4 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '4.0.4'
gem 'rails', '4.0.9'

gem 'active_hash', '~> 1.3'
gem 'activerecord-jdbcmysql-adapter', platform: :jruby
Expand All @@ -11,9 +11,6 @@ gem 'binding_of_caller', group: :development
gem 'capistrano', '2.15.5', group: :development
gem 'capistrano-ext', group: :development
gem 'capistrano-rbenv', '~> 1.0', group: :development

gem "jasminerice", git: 'https://github.com/bradphelan/jasminerice.git', group: [:test, :development] # needed for implement coffeescript, fixtures and asset pipeline serverd css into jasmine
gem "rack_session_access", "~> 0.1.1", group: :test
gem 'capybara', '~> 2.4', group: [:test, :development]
gem 'capybara-screenshot', group: [:test, :development]
gem 'chunky_png', '~> 1.2'
Expand All @@ -31,6 +28,7 @@ gem 'gettext_i18n_rails', '~> 1.0'
gem 'guard-jasmine', '~> 1.19', group: [:test, :development]
gem 'haml', '~> 4.0'
gem 'haml_assets', '~> 0.2'
gem "jasminerice", git: 'https://github.com/bradphelan/jasminerice.git', group: [:test, :development] # needed for implement coffeescript, fixtures and asset pipeline serverd css into jasmine
gem 'jquery-rails', '2.1.3' # '~> 2.1' FIXME the version 2.1.4 clashes with underscore-rails 1.4.2.1 + # NOTE in order to upgrate to '~> 3.1', first adapt the code removing the .live() functions
gem 'jquery-tmpl-rails', '~> 1.1'
gem 'jruby-openssl', platform: :jruby
Expand All @@ -50,6 +48,7 @@ gem 'protected_attributes', '~> 1.0'
gem 'pry', group: [:test, :development]
gem 'pry-byebug', group: [:test, :development]
gem 'pry-rails', group: [:test, :development]
gem "rack_session_access", "~> 0.1.1", group: :test
gem 'rails_autolink', '~> 1.0'
gem 'rake' # So that cronjobs work -- otherwise they can't find rake
gem 'redcarpet', group: [:test, :development] # This isn't being pulled in by yard, but it's required
Expand Down
128 changes: 66 additions & 62 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@ GIT
GEM
remote: http://rubygems.org/
specs:
actionmailer (4.0.4)
actionpack (= 4.0.4)
actionmailer (4.0.9)
actionpack (= 4.0.9)
mail (~> 2.5.4)
actionpack (4.0.4)
activesupport (= 4.0.4)
actionpack (4.0.9)
activesupport (= 4.0.9)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
active_hash (1.3.0)
active_hash (1.4.0)
activesupport (>= 2.2.2)
activemodel (4.0.4)
activesupport (= 4.0.4)
activemodel (4.0.9)
activesupport (= 4.0.9)
builder (~> 3.1.0)
activerecord (4.0.4)
activemodel (= 4.0.4)
activerecord (4.0.9)
activemodel (= 4.0.9)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.4)
activesupport (= 4.0.9)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.4)
activesupport (4.0.9)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
Expand All @@ -48,15 +48,17 @@ GEM
addressable (2.3.6)
arel (4.0.2)
barby (0.5.1)
better_errors (1.1.0)
better_errors (2.0.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.1.4)
byebug (2.7.0)
columnize (~> 0.3)
byebug (3.4.0)
columnize (~> 0.8)
debugger-linecache (~> 1.2)
slop (~> 3.6)
callsite (0.0.11)
capistrano (2.15.5)
highline
Expand All @@ -77,12 +79,12 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-screenshot (0.3.21)
capybara-screenshot (0.3.22)
capybara (>= 1.0, < 3)
colorize
colored
launchy
celluloid (0.15.2)
timers (~> 1.1.0)
celluloid (0.16.0)
timers (~> 4.0.0)
childprocess (0.5.3)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.3.1)
Expand All @@ -97,8 +99,8 @@ GEM
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.7.1)
colorize (0.7.3)
coffee-script-source (1.8.0)
colored (1.2)
columnize (0.8.9)
compass (0.12.7)
chunky_png (~> 1.2)
Expand All @@ -107,7 +109,7 @@ GEM
compass-rails (1.1.7)
compass (>= 0.12.2)
sprockets (<= 2.11.0)
cucumber (1.3.16)
cucumber (1.3.17)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
Expand Down Expand Up @@ -140,7 +142,7 @@ GEM
railties (>= 3.2, < 5.0)
formatador (0.2.5)
fssm (0.2.10)
geocoder (1.2.3)
geocoder (1.2.5)
gettext_i18n_rails (1.1.0)
fast_gettext (>= 0.9.0)
gherkin (2.12.2)
Expand All @@ -164,6 +166,7 @@ GEM
tilt
highline (1.6.21)
hike (1.2.3)
hitimes (1.2.2)
i18n (0.6.11)
jquery-rails (2.1.3)
railties (>= 3.1.0, < 5.0)
Expand All @@ -175,7 +178,7 @@ GEM
open4 (~> 1.0)
launchy (2.4.2)
addressable (~> 2.3)
libv8 (3.16.14.3)
libv8 (3.16.14.7)
listen (2.7.9)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
Expand All @@ -190,22 +193,22 @@ GEM
railties (>= 3.0.0, < 5.0.0)
method_source (0.8.2)
mime-types (1.25.1)
mini_magick (3.8.0)
mini_magick (3.8.1)
subexec (~> 0.2.1)
mini_portile (0.6.0)
minitest (4.7.5)
multi_json (1.10.1)
multi_test (0.1.1)
mysql2 (0.3.16)
net-ldap (0.6.1)
net-ldap (0.8.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
newrelic_rpm (3.9.0.229)
newrelic_rpm (3.9.4.245)
nilify_blanks (1.1.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -221,12 +224,12 @@ GEM
polyglot (0.3.5)
protected_attributes (1.0.8)
activemodel (>= 4.0.1, < 5.0)
pry (0.10.0)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (1.3.3)
byebug (~> 2.7)
pry-byebug (2.0.0)
byebug (~> 3.4)
pry (~> 0.10)
pry-rails (0.3.2)
pry (>= 0.9.10)
Expand All @@ -238,19 +241,19 @@ GEM
rack_session_access (0.1.1)
builder (>= 2.0.0)
rack (>= 1.0.0)
rails (4.0.4)
actionmailer (= 4.0.4)
actionpack (= 4.0.4)
activerecord (= 4.0.4)
activesupport (= 4.0.4)
rails (4.0.9)
actionmailer (= 4.0.9)
actionpack (= 4.0.9)
activerecord (= 4.0.9)
activesupport (= 4.0.9)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.4)
sprockets-rails (~> 2.0.0)
railties (= 4.0.9)
sprockets-rails (~> 2.0)
rails_autolink (1.1.6)
rails (> 3.1)
railties (4.0.4)
actionpack (= 4.0.4)
activesupport (= 4.0.4)
railties (4.0.9)
actionpack (= 4.0.9)
activesupport (= 4.0.9)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
Expand All @@ -262,41 +265,41 @@ GEM
rgl (0.4.0)
rake
stream (>= 0.5)
rspec (3.0.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-core (3.0.3)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.3)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-core (3.1.2)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.3)
rspec-support (~> 3.0.0)
rspec-rails (3.0.2)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.0)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.3)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.0)
ruby_parser (3.6.2)
sexp_processor (~> 4.1)
rubyzip (1.1.6)
sass (3.2.19)
sass-rails (4.0.3)
sass-rails (4.0.2)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
sprockets-rails (~> 2.0.0)
selenium-webdriver (2.43.0)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
sexp_processor (4.4.3)
sexp_processor (4.4.4)
slop (3.6.0)
sprockets (2.11.0)
hike (~> 1.2)
Expand All @@ -320,15 +323,16 @@ GEM
thread_safe (0.3.4)
tilt (1.4.1)
timecop (0.7.1)
timers (1.1.0)
timers (4.0.1)
hitimes
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.40)
tzinfo (0.3.41)
uglifier (2.5.3)
execjs (>= 0.3.0)
json (>= 1.8.0)
underscore-rails (1.6.0)
underscore-rails (1.7.0)
websocket (1.2.1)
will_paginate (3.0.7)
xpath (2.0.0)
Expand Down Expand Up @@ -386,7 +390,7 @@ DEPENDENCIES
pry-byebug
pry-rails
rack_session_access (~> 0.1.1)
rails (= 4.0.4)
rails (= 4.0.9)
rails_autolink (~> 1.0)
rake
redcarpet
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/borrow/models/timeout_countdown.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class window.App.TimeoutCountdown

updateTime: =>
do @sync
remainingSeconds = _.clone(@currentTimeout).add("minutes", @timeoutMinutes).diff(moment(), "seconds")
remainingSeconds = moment(@currentTimeout).add("minutes", @timeoutMinutes).diff(moment(), "seconds")
if remainingSeconds <= 0
do @timeout
if @seconds <= 0 and @minutes > 0
Expand Down

0 comments on commit 3cb4b3e

Please sign in to comment.