[FIX CI] fix scenarios with 3 trials

Squashed commit of the following:

commit 28a49c6d5e2b7107beb4824103d89b55f0960018
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 13:57:03 2014 +0200

    try @chrome

commit b3df16af056be2172b0fa88aa8c386dbda129e7a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 12:20:30 2014 +0200

    features/support/env_screenshots.rb

commit adad79d4e997b037f07817f823a3d08ff664b871
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 11:36:31 2014 +0200

    testing autocomplete

commit 845f404a68c44e34866d799580a3853de9a44cbf
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 11:26:55 2014 +0200

    Revert "test hotspot feature"

    This reverts commit d82c5407b20ed03ca6848bbb0759bfa67c054450.

commit d82c5407b20ed03ca6848bbb0759bfa67c054450
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 11:23:35 2014 +0200

    test hotspot feature

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

    inventarhelfer steps fix

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

    fix kalender.feature

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

    fix paket item inventory helfer test

commit 7aeb3e7b1458ac29634baf54450292ac1c4dfdbf
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 6a306888dde6d1324d8f642c19781f8c3e7b62df
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 14:41:25 2014 +0200

    fix features/borrow/vorlagen.feature:45

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

    fix features/examples/ausleihe.feature:79

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

    fix hand over add.feature

commit d588f2880068a190c8c90c62bd827533f56b3753
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 2b4b74ff41bb39842c2f986f43a42fe0face731d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 10:59:18 2014 +0200

    regenerate scenario tasks with auto_trials: 2
Safer test execution on Travis CI.
merge part of fix_3_trials

Conflicts:
	cider-ci/tasks/cucumber_scenarios.yml
	features/examples/aushaendigung.feature
	features/personas/dumps/minimal_seed.sql
	features/support/env_screenshots.rb
Workaround for a bug in Microsoft Internet Explorer.
[#76864570] data consistency report without database foreign keys

Squashed commit of the following:

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

    consistency report without database foreign keys

commit 1901cd0eea46076ef65424d56b1ac9617452ff93
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 d7c469d771e07d1e4625d0347eb95fc89e275a4d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 12 15:41:39 2014 +0200

    consistency report with delete interactions

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

    upgrading to Rails 4.0.9

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

    catch exception on foreign keys migration

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

    regenerating dumps

commit ec7eeea26cea1098dfe01089dd6819f0080176a9
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 7cc679d7a476dfbdf28a97360e2064a33929af08
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 17:49:41 2014 +0200

    inventarhelfer steps fix

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

    fix kalender.feature

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

    fix typo

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

    adapting rspec syntax

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

    fix paket item inventory helfer test

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

    fix consistency interaction

commit 7aeb3e7b1458ac29634baf54450292ac1c4dfdbf
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 6a306888dde6d1324d8f642c19781f8c3e7b62df
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 14:41:25 2014 +0200

    fix features/borrow/vorlagen.feature:45

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

    fix features/examples/ausleihe.feature:79

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

    fix hand over add.feature

commit d588f2880068a190c8c90c62bd827533f56b3753
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 2b4b74ff41bb39842c2f986f43a42fe0face731d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 10:59:18 2014 +0200

    regenerate scenario tasks with auto_trials: 2

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

    regenerating dumps

commit eebc88279882b7773f913df2f2f854b668f2c91e
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 98ba6464a083ebb8058bb7ce2122a85d96fdac5e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 8 17:41:51 2014 +0200

    define inverse associations needed for consistency report

commit 53bc6963ba12067cb2065428caca6ef151b211f0
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 b12c910ca54dd75e0ab8aee99fb621da3d352df3
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 5bed90b6c7123cf19e7cb077fdfff38e8a0a6474
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 8 16:59:01 2014 +0200

    [FIX CI]

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

    [FIX CI] @firefox tag

commit bcd1bd217b97400e69d728b3c8d52bf3a2bbff3a
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 5788ff04e32dd4a0ad14f52a53cde57a0f6d39c5
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 8 15:43:18 2014 +0200

    regenerating dumps

commit 16a3d22529f66c95e75bc39150a5dbcab0268d98
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 c16305785ec27784347f5a6e057ca5f58dcf63aa
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 cfa9b1586c212e87666f54ad361dabe73ff24bf7
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 e2f4aa1a45a099bd5d16be2780dadb19e6b4fce3
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 a07c318b2fcab2e1139fe12771d6e3088567f2af
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 b97a7558c21ab2f4babb707a6aeb3003b56813b1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 8 15:35:03 2014 +0200

    [BUGFIX] availability coffee withoutLines() consider soft overbooking

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

    [FIX CI] foreign keys cascading

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

    [FIX CI] timeout countdown

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

    regenerated dumps

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

    [FIX CI]

commit 6a774182b7d3d629b2dddddfac630ff46bb45531
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 5dfebc232d6456378e235fdb0ec34ffc4cf159bf
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 5 13:42:05 2014 +0200

    fix gegenstand features

commit 5cbea9aa8c22eda53ac1d5179d9e25f6d6092e56
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 e36c2767ec50ea14f8051375de04f0c53bacbbc8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 5 12:37:08 2014 +0200

    foreign keys with cascading

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

    regenerate dumps

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

    [FIX CI] item/package steps

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

    fix steps

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

    regenerate dumps

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

    fix visit / visit lines migrations

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

    introducing sql foreign keys

commit 3d42dd64ce4fcf03efecf520c31820f4a5864591
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 dd966c72da6b2baabfcffc0e7fbe6b4015b46f58
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 aa6190edea2985c4506135b6b4f9af6d937ffec8
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 4 15:15:50 2014 +0200

    prepare dumps

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

    [FIX CI] gegenstand_editiere.feature

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

    fix all owner_ids in fixtures

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

    [FIX CI] ausleihe.feature

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

    properly check for existence of deferred objects

commit ec07dd9ea634a60730d20070ec866e7166c2b8fa
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 33df6eaa6bc8f0c7bca88ac1a02c3a70b166b01b
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 4 09:50:42 2014 +0200

    prepare personas dumps

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

    should -> expect

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

    fix hand over travel time

commit 65dfca80d3b38560ff95c571af0ed7acbd8b1f32
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 e28ae1b1af8a5f89fde414ccb5b73fe6f5346a48
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 3 12:27:13 2014 +0200

    add firefox tag to modell.feature test

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

    Remove comment for fixed issue

commit ff053beb3430b82ffe441d1d7d3dc281ae9a4f54
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 541a0dadc23f217a02e1789632f945c0dd8926dc
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 3 11:04:05 2014 +0200

    optimize sign contract step

commit 72856b80da331985edecea0ef1e059b8d343dfe0
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 ca542d856a912c215e623f312394b55568cc7388
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 2 17:35:49 2014 +0200

    database consistency report

commit 422952fc985ba088f71b51b12c9e9f2c682f0099
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 173b0b0260f089469efb35f621f8224fbaf434dc
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 2 15:31:20 2014 +0200

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

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

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

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

    removing @current tag from scenarios
[#76864570] data consistency report with database foreign keys

Squashed commit of the following:

commit 439afbf257f310d3d273ff2ab1525844389c7704
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 15 12:15:26 2014 +0200

    introducing database foreign keys
Merge branch 'upcoming' of github.com:zhdk/leihs
[#78349852] unsuspend delegations (in inventory pool)

Squashed commit of the following:

commit 5caf37088d7472785603457edb607f1bfc661283
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 15 15:20:28 2014 +0200

    unsuspend delegation
Support Shibboleth rudimentarily.
[FIX CI] various fixes from 'fix_3_trials' branch

Squashed commit of the following:

commit 866c69b792bf0a839758d6b3ef225d89bc49805c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:57:51 2014 +0200

    [CI] set auto trials to 1

commit bf97a347ffb7724c3166fdd963572860200826ef
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:39:56 2014 +0200

    [CI] remove strict definition, raise timeout to 5 minutes, generating 1 single personas dump

commit f3335044c42eb22dbec4e4aa6f58b9860f74d1a5
Merge: 5b63b37 02751e9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 16:39:21 2014 +0200

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

commit 5b63b37fb065c2caebff91744aa959e4cc3ce597
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 16:39:17 2014 +0200

    optimize edit_take_back_end_date.feature

commit 02751e9f748b4cbcfdb3bd8c1ae4071e61de5519
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:16:36 2014 +0200

    removing capybara-screenshot gem

commit 9773732f816ed21d046b7915b8a2aa24d484835d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:14:08 2014 +0200

    removing custom cucumber benchmark logs

commit 646572f1a5777aa8d55b5ea611355b872eb8177d
Merge: 5d90132 350a369
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 16:11:20 2014 +0200

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

commit 5d90132b9b0479d20175d1329f77855eddfe5399
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 16:11:16 2014 +0200

    fix add_item.feature

commit 350a369fab55e45df7227d8215cb875dcfc93701
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:05:38 2014 +0200

    refactoring text assertions from rspec to capybara

commit 7cebb120e99194e4afc758e64ddf5ce9133a7040
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 15:16:53 2014 +0200

    [FIX CI]

commit 990a9807515945fc9e8664baf7b975aff6744ad0
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 14:57:18 2014 +0200

    additional forgotten file from fix_inventory_list

commit 88c1847291dce071aeada0323b4ab96dbe7ae4d1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 14:51:51 2014 +0200

    fix inventory index list (squash merge of fix_inventory_list)

    Conflicts:
    	app/assets/javascripts/manage/controllers/inventory_index_controller.coffee
    	app/assets/javascripts/models/inventory.coffee
    	app/assets/javascripts/modules/rooted.coffee

commit 4b08b4d3f0db8ecd5b2fc180d8559ac8a1f83e3f
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 14:44:57 2014 +0200

    [FIX CI]

commit 59b7392dc7ab8355ed148300a83b86241b39d933
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 14:25:19 2014 +0200

    [FIX CI]

commit 30c0769c9357e0a304015923c2c166e766f4937a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 12:15:20 2014 +0200

    [FIX CI] aushaendigung.feature, ausleihe.feature, database.feature

commit 6886d153471ba12c313e6e1d3972e4c462342ff3
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 11:49:27 2014 +0200

    [FIX CI] gruppen.feature

commit 7d4df5c7d57ee2cc76c60e75642f79ad5aba8f0b
Merge: 2ed6b36 596e16e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 15 15:59:24 2014 +0200

    Merge branch 'master' into fix_3_trials

    Conflicts:
    	Gemfile.lock
    	cider-ci/bin/list_cucumber_tasks.rb
    	cider-ci/tasks/cucumber.yml
    	cider-ci/tasks/cucumber_scenarios.yml
    	cider-ci/tasks/cucumber_strict.yml
    	cider-ci/tasks/cucumber_subset.yml
    	features/examples/ausleihe.feature
    	features/personas/dumps/minimal_seed.sql

commit 2ed6b36bd3f6244831b04cc7a4164ec256ea69c7
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 15 15:55:12 2014 +0200

    Revert "Inventory Spine Model removed & Rooted Module simplified"

    This reverts commit ac1a50fd13fa4a95ef05200b508a3e3ec6e155aa.

commit ac1a50fd13fa4a95ef05200b508a3e3ec6e155aa
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 15 15:47:43 2014 +0200

    Inventory Spine Model removed & Rooted Module simplified

commit b79f4c37c13763cf4698b214b2f2070248ac4743
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 15:08:38 2014 +0200

    dumps

commit 778206ce5fd81f371bb6be18f7a6fb291c8789f2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 15:06:23 2014 +0200

    various fixes

commit 5530d279c216da40e4e614bcfa6e9cffd97d5732
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 13:58:14 2014 +0200

    move Array.class_eval to env.rb

commit 9a3a4f9b3f3ff740cd24fd70ee7d5842032b5104
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 11:46:33 2014 +0200

    fix test probleme.feature

commit faef95dff65864c144956b57484728db4f0323b1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 11:46:15 2014 +0200

    fix problems tooltip availability for groups frontend

commit 6b6285a4f8b6d06f0e7d822d233651f3b8ae7ee8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 15:46:40 2014 +0200

    overriding Array#shuffle and Array#sample with random based on TEST_DATETIME

commit 606213cb56d0eb23a5fd35b61e5f307a1c916751
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 15:12:43 2014 +0200

    just testing

commit 0c586c514ea37bbe7df8025a62cc6f3fc3413738
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 15:03:16 2014 +0200

    just testing

commit 971cee23f1d167f96a6450f702c0d470d251078b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 15:00:32 2014 +0200

    just testing

commit cec2fc082bf845bae71763a3e4d8aa39c04b25cb
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:57:27 2014 +0200

    just testing

commit 83693e6f3aa80e672ac49156870950da50cbdb38
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:55:09 2014 +0200

    just testing

commit 54c01de7094e983cfd0fea8a1aa41d808c0f6cac
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:50:41 2014 +0200

    just testing

commit 3eac856a8ca9316e36fad44af3a6ce261aa0b5c0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:47:10 2014 +0200

    small check of shuffle

commit 09fcd5a097d22c093708543d9e56a7116da0d6a9
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:39:23 2014 +0200

    small check of srand

commit 17bfca5e3ab2e8787c0576d793301e3478f0c7b2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 13:37:18 2014 +0200

    merge branch fs_cucumber_browser

    Conflicts:
    	cider-ci/tasks/cucumber.yml
    	cider-ci/tasks/cucumber_scenarios.yml
    	cider-ci/tasks/cucumber_strict.yml
    	features/examples/aushaendigung.feature
    	features/examples/ruestliste.feature
    	features/personas/dumps/minimal_seed.sql
    	features/support/env_screenshots.rb

commit 80131b571df554dc05f0de4e1a0c3b04069b7956
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 13:04:57 2014 +0200

    @chrome for aushaendigung.feature

commit b91f928b03c418cd89566d0c3e43bc69f8122d07
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 13:03:10 2014 +0200

    fix add.feature

commit c4432874d49750eda731750622eba23152db8666
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 11:43:14 2014 +0200

    fix ruestliste.feature -> @chrome

commit d5caca0117c602b9197743430d0a6dae73a3377c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 11:38:27 2014 +0200

    fix features/manage/acknowledge/add_item.feature:25

commit e0e9f09bd575b63dd2706108739a3714989e1392
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 10:14:44 2014 +0200

    fix env screenshots#

commit 3ac2011c73eee37f6b0441e891187de9394debda
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 10:01:33 2014 +0200

    new dumps

commit 522d27738f4b20e7b1504bedf14aa351cbdaeb90
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 09:48:32 2014 +0200

    revert @chrome tag back to @firefox

commit b09788d8d79b4f29c02b6e02e47e8b79e7cd5c61
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 09:46:59 2014 +0200

    gem update selenium-webdriver

commit 28a49c6d5e2b7107beb4824103d89b55f0960018
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 13:57:03 2014 +0200

    try @chrome

commit b3df16af056be2172b0fa88aa8c386dbda129e7a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 12:20:30 2014 +0200

    features/support/env_screenshots.rb

commit adad79d4e997b037f07817f823a3d08ff664b871
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 11:36:31 2014 +0200

    testing autocomplete

commit 845f404a68c44e34866d799580a3853de9a44cbf
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 11:26:55 2014 +0200

    Revert "test hotspot feature"

    This reverts commit d82c5407b20ed03ca6848bbb0759bfa67c054450.

commit d82c5407b20ed03ca6848bbb0759bfa67c054450
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 11:23:35 2014 +0200

    test hotspot feature

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

    inventarhelfer steps fix

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

    fix kalender.feature

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

    fix paket item inventory helfer test

commit 7aeb3e7b1458ac29634baf54450292ac1c4dfdbf
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 6a306888dde6d1324d8f642c19781f8c3e7b62df
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 14:41:25 2014 +0200

    fix features/borrow/vorlagen.feature:45

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

    fix features/examples/ausleihe.feature:79

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

    fix hand over add.feature

commit d588f2880068a190c8c90c62bd827533f56b3753
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 2b4b74ff41bb39842c2f986f43a42fe0face731d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 10:59:18 2014 +0200

    regenerate scenario tasks with auto_trials: 2
6 dumps & 3 trials
test prepare
prepare test DEFAULT_BROWSER=firefox
[#76866602] fix 3 trails tests

Squashed commit of the following:

commit 64d90a3dffb71827576efc6e3de78c5c14771173
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 17 13:45:02 2014 +0200

    remove one dump;

commit 84a73953e95b4c74a96f155da886e1a2091cd2f0
Merge: ebf32df 449184f
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 17 13:43:39 2014 +0200

    Merge branch 'master' into fix_3_trials

    Conflicts:
    	cider-ci/bin/list_cucumber_tasks.rb
    	cider-ci/tasks/cucumber.yml
    	cider-ci/tasks/cucumber_scenarios.yml
    	features/personas/dumps/minimal_seed.sql
    	features/step_definitions/manage/acknowledge/edit_order_line_steps.rb
    	lib/tasks/app/test.rake

commit ebf32df52e77a4b3532fce899f2be56f27cf6e20
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 17 13:34:35 2014 +0200

    fix inventar feature -> responsible ip

commit dcc3c511159d1201447cb0d424e57f9e1f3e2162
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 17 13:19:48 2014 +0200

    add another @browser tag

commit abe2cf31d9908f483d0e983a004b6e9f2cc3c452
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 17 13:08:33 2014 +0200

    add some @browser tags for debugging

commit a8931d6cd9d5440f48f54c07bdc50cc76db00981
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 17 12:55:18 2014 +0200

    hotspots

commit da20a9f55499039e36e789c8b5a0d311541cd232
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 11:51:39 2014 +0200

    [FIX CI] hand_over/add.feature

commit 5f86ff9e703b6750c1f2ee35538171cf4d5baae2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 17 11:44:53 2014 +0200

    fix kalendar.feature

commit edf559adbd48f8da259a0fc4a5f86c4cd3ce21c8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 11:28:28 2014 +0200

    [FIX CI] acknowledge/edit_order_line.feature

commit 8f5b1db451ff84d8c9b11ec8668ec90de7d6f2a7
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 11:19:12 2014 +0200

    [FIX CI] probleme.feature

commit 313ecf4e6033bdf988fa21719062684cbf9d6240
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 11:16:09 2014 +0200

    [FIX CI] ausleihe.feature

commit de3bb8f196690af428e2f66e8f52bdcb7e510acf
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 11:10:29 2014 +0200

    [FIX CI] ruestliste.feature

commit 2afe1b7f92449c1bb8f8183d57848b47c9402e46
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 11:05:45 2014 +0200

    [FIX CI] tagesansicht.feature

commit 75faeab8d0bfcec014c639d7c00fbcd8363e15d9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 17 11:04:01 2014 +0200

    fix features/step_definitions/examples/kalendar_steps.rb

commit 866c69b792bf0a839758d6b3ef225d89bc49805c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:57:51 2014 +0200

    [CI] set auto trials to 1

commit bf97a347ffb7724c3166fdd963572860200826ef
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:39:56 2014 +0200

    [CI] remove strict definition, raise timeout to 5 minutes, generating 1 single personas dump

commit f3335044c42eb22dbec4e4aa6f58b9860f74d1a5
Merge: 5b63b37 02751e9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 16:39:21 2014 +0200

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

commit 5b63b37fb065c2caebff91744aa959e4cc3ce597
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 16:39:17 2014 +0200

    optimize edit_take_back_end_date.feature

commit 02751e9f748b4cbcfdb3bd8c1ae4071e61de5519
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:16:36 2014 +0200

    removing capybara-screenshot gem

commit 9773732f816ed21d046b7915b8a2aa24d484835d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:14:08 2014 +0200

    removing custom cucumber benchmark logs

commit 646572f1a5777aa8d55b5ea611355b872eb8177d
Merge: 5d90132 350a369
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 16:11:20 2014 +0200

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

commit 5d90132b9b0479d20175d1329f77855eddfe5399
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 16:11:16 2014 +0200

    fix add_item.feature

commit 350a369fab55e45df7227d8215cb875dcfc93701
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:05:38 2014 +0200

    refactoring text assertions from rspec to capybara

commit 7cebb120e99194e4afc758e64ddf5ce9133a7040
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 15:16:53 2014 +0200

    [FIX CI]

commit 990a9807515945fc9e8664baf7b975aff6744ad0
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 14:57:18 2014 +0200

    additional forgotten file from fix_inventory_list

commit 88c1847291dce071aeada0323b4ab96dbe7ae4d1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 14:51:51 2014 +0200

    fix inventory index list (squash merge of fix_inventory_list)

    Conflicts:
    	app/assets/javascripts/manage/controllers/inventory_index_controller.coffee
    	app/assets/javascripts/models/inventory.coffee
    	app/assets/javascripts/modules/rooted.coffee

commit 4b08b4d3f0db8ecd5b2fc180d8559ac8a1f83e3f
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 14:44:57 2014 +0200

    [FIX CI]

commit 59b7392dc7ab8355ed148300a83b86241b39d933
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 14:25:19 2014 +0200

    [FIX CI]

commit 30c0769c9357e0a304015923c2c166e766f4937a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 12:15:20 2014 +0200

    [FIX CI] aushaendigung.feature, ausleihe.feature, database.feature

commit 6886d153471ba12c313e6e1d3972e4c462342ff3
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 11:49:27 2014 +0200

    [FIX CI] gruppen.feature

commit 7d4df5c7d57ee2cc76c60e75642f79ad5aba8f0b
Merge: 2ed6b36 596e16e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 15 15:59:24 2014 +0200

    Merge branch 'master' into fix_3_trials

    Conflicts:
    	Gemfile.lock
    	cider-ci/bin/list_cucumber_tasks.rb
    	cider-ci/tasks/cucumber.yml
    	cider-ci/tasks/cucumber_scenarios.yml
    	cider-ci/tasks/cucumber_strict.yml
    	cider-ci/tasks/cucumber_subset.yml
    	features/examples/ausleihe.feature
    	features/personas/dumps/minimal_seed.sql

commit 2ed6b36bd3f6244831b04cc7a4164ec256ea69c7
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 15 15:55:12 2014 +0200

    Revert "Inventory Spine Model removed & Rooted Module simplified"

    This reverts commit ac1a50fd13fa4a95ef05200b508a3e3ec6e155aa.

commit ac1a50fd13fa4a95ef05200b508a3e3ec6e155aa
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 15 15:47:43 2014 +0200

    Inventory Spine Model removed & Rooted Module simplified

commit b79f4c37c13763cf4698b214b2f2070248ac4743
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 15:08:38 2014 +0200

    dumps

commit 778206ce5fd81f371bb6be18f7a6fb291c8789f2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 15:06:23 2014 +0200

    various fixes

commit 5530d279c216da40e4e614bcfa6e9cffd97d5732
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 13:58:14 2014 +0200

    move Array.class_eval to env.rb

commit 9a3a4f9b3f3ff740cd24fd70ee7d5842032b5104
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 11:46:33 2014 +0200

    fix test probleme.feature

commit faef95dff65864c144956b57484728db4f0323b1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 11:46:15 2014 +0200

    fix problems tooltip availability for groups frontend

commit 6b6285a4f8b6d06f0e7d822d233651f3b8ae7ee8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 15:46:40 2014 +0200

    overriding Array#shuffle and Array#sample with random based on TEST_DATETIME

commit 606213cb56d0eb23a5fd35b61e5f307a1c916751
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 15:12:43 2014 +0200

    just testing

commit 0c586c514ea37bbe7df8025a62cc6f3fc3413738
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 15:03:16 2014 +0200

    just testing

commit 971cee23f1d167f96a6450f702c0d470d251078b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 15:00:32 2014 +0200

    just testing

commit cec2fc082bf845bae71763a3e4d8aa39c04b25cb
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:57:27 2014 +0200

    just testing

commit 83693e6f3aa80e672ac49156870950da50cbdb38
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:55:09 2014 +0200

    just testing

commit 54c01de7094e983cfd0fea8a1aa41d808c0f6cac
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:50:41 2014 +0200

    just testing

commit 3eac856a8ca9316e36fad44af3a6ce261aa0b5c0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:47:10 2014 +0200

    small check of shuffle

commit 09fcd5a097d22c093708543d9e56a7116da0d6a9
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:39:23 2014 +0200

    small check of srand

commit 17bfca5e3ab2e8787c0576d793301e3478f0c7b2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 13:37:18 2014 +0200

    merge branch fs_cucumber_browser

    Conflicts:
    	cider-ci/tasks/cucumber.yml
    	cider-ci/tasks/cucumber_scenarios.yml
    	cider-ci/tasks/cucumber_strict.yml
    	features/examples/aushaendigung.feature
    	features/examples/ruestliste.feature
    	features/personas/dumps/minimal_seed.sql
    	features/support/env_screenshots.rb

commit 80131b571df554dc05f0de4e1a0c3b04069b7956
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 13:04:57 2014 +0200

    @chrome for aushaendigung.feature

commit b91f928b03c418cd89566d0c3e43bc69f8122d07
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 13:03:10 2014 +0200

    fix add.feature

commit c4432874d49750eda731750622eba23152db8666
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 11:43:14 2014 +0200

    fix ruestliste.feature -> @chrome

commit d5caca0117c602b9197743430d0a6dae73a3377c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 11:38:27 2014 +0200

    fix features/manage/acknowledge/add_item.feature:25

commit e0e9f09bd575b63dd2706108739a3714989e1392
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 10:14:44 2014 +0200

    fix env screenshots#

commit 3ac2011c73eee37f6b0441e891187de9394debda
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 10:01:33 2014 +0200

    new dumps

commit 522d27738f4b20e7b1504bedf14aa351cbdaeb90
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 09:48:32 2014 +0200

    revert @chrome tag back to @firefox

commit b09788d8d79b4f29c02b6e02e47e8b79e7cd5c61
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 09:46:59 2014 +0200

    gem update selenium-webdriver

commit 28a49c6d5e2b7107beb4824103d89b55f0960018
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 13:57:03 2014 +0200

    try @chrome

commit b3df16af056be2172b0fa88aa8c386dbda129e7a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 12:20:30 2014 +0200

    features/support/env_screenshots.rb

commit adad79d4e997b037f07817f823a3d08ff664b871
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 11:36:31 2014 +0200

    testing autocomplete

commit 845f404a68c44e34866d799580a3853de9a44cbf
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 11:26:55 2014 +0200

    Revert "test hotspot feature"

    This reverts commit d82c5407b20ed03ca6848bbb0759bfa67c054450.

commit d82c5407b20ed03ca6848bbb0759bfa67c054450
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 11:23:35 2014 +0200

    test hotspot feature

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

    inventarhelfer steps fix

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

    fix kalender.feature

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

    fix paket item inventory helfer test

commit 7aeb3e7b1458ac29634baf54450292ac1c4dfdbf
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 6a306888dde6d1324d8f642c19781f8c3e7b62df
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 14:41:25 2014 +0200

    fix features/borrow/vorlagen.feature:45

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

    fix features/examples/ausleihe.feature:79

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

    fix hand over add.feature

commit d588f2880068a190c8c90c62bd827533f56b3753
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 2b4b74ff41bb39842c2f986f43a42fe0face731d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 10:59:18 2014 +0200

    regenerate scenario tasks with auto_trials: 2
Merge branch 'master' into rca_port_shibboleth
Enabling coverage, experimental simplified non-cider test runner.
Correct modes, removing old scripts.
Proper script execution for Travis.
[#56766060] removing (reducing) sleeps and page.execute_scripts

Squashed commit of the following:

commit f2808fc741dd849a0a5a9366ad4f9a4c99d1464e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 22 13:05:15 2014 +0200

    [FIX CI]

commit b29738ec2f635effd37773d8bc855517c021d552
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 22 12:22:01 2014 +0200

    [FIX CI]

commit 46c3ab8d3fcdf34d322a40c31313153a0f30a2b5
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 19 21:50:52 2014 +0200

    regenerating dumps

commit c1d2922b48b7b1964cd0401d179747f07ef850d8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 19 16:43:01 2014 +0200

    exhumating dead step

commit 23670e67b0c7f7a9c96986172755440b7a3b07ed
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 19 16:27:48 2014 +0200

    [FIX CI]

commit 32dfd02ffbe8a948e4d5b3dc88feb0b107fc7243
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 19 15:48:44 2014 +0200

    fix typo

commit 6f3f0a70099afa0299df99dc47bbf8107d102146
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 19 15:45:06 2014 +0200

    wrapping all() with within()

commit 5200749a4d1bd2bd6531d8dfaa40d82c9296206d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 19 14:22:07 2014 +0200

    javascript callback on hand_over destroy

commit b10fe093f90a5f11889b2434c23a350cf2c8a370
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 19 14:21:29 2014 +0200

    [FIX CI]

commit 8b849e49f12151fbc6177bd74ba160ccfc3e023c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 19 11:23:02 2014 +0200

    wrapping all() with within()

commit 072903169966836275832691e99d020dd7a9c1b9
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 18 20:27:50 2014 +0200

    Revert "[FIX CI] availability check"

    This reverts commit 6c0245d8394104c2e6d2a6bdfd075647df029566.

commit 3d43b8d135dc8b8c1766b9543372807326a728aa
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 18 19:26:43 2014 +0200

    regenerating dumps

commit 6c0245d8394104c2e6d2a6bdfd075647df029566
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 18 19:06:53 2014 +0200

    [FIX CI] availability check

commit aa466ecffbd84514334f340d471a5f262bb2025d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 18 17:18:36 2014 +0200

    regenerating dumps

commit fe479e3b3d6f9d3a9839e10e63cbcaaadda10b09
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 18 16:39:53 2014 +0200

    dry image upload steps

commit 21419a78403ac9fc63526abe3ec33b5ebec119bd
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 18 16:29:58 2014 +0200

    removing page.execute_script

commit 6f411a656671776b26242842b3b8b9ce46e690e7
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 18 14:56:52 2014 +0200

    [FIX CI]

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

    [FIX CI]

commit f1376e7e035607a2a2827a06f748557979382eed
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 21:48:42 2014 +0200

    adapting test syntax

commit d12a6a13780a10e28a030cbea813f781e9735445
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 18:42:01 2014 +0200

    removing page.execute_script (wip)

commit ef07c0816629d5a429a20586a62fb9a3dda55e8d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 17:56:13 2014 +0200

    [FIX CI]

commit cc58826b0030d35e0f9fde299647e14f48a506a8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 15:50:58 2014 +0200

    [FIX CI]

commit 81e52d317b9d37ff5b79ca0099a21c6f16606a28
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 15:34:08 2014 +0200

    [FIX CI]

commit 9ec15db5e83742820c7406f82c2d69017d3ed802
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 15:25:15 2014 +0200

    [FIX CI]

commit 5b4bdd05a0d56cf3904621c8009b7cc84cb6b3f1
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 14:38:07 2014 +0200

    removing sleeps

commit e62c0248b078acdce9b0670df307dee7f4ccb9d2
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 14:30:45 2014 +0200

    generated dumps

commit 8d5daf8324b54140dee88e1559aa935185ee829e
Merge: 5609237 ea258a6
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 14:27:50 2014 +0200

    Merge branch 'master' into fs_remove_sleeps

    Conflicts:
    	cider-ci/bin/list_cucumber_tasks.rb
    	cider-ci/tasks/cucumber.yml
    	cider-ci/tasks/cucumber_scenarios.yml
    	features/personas/dumps/minimal_seed.sql
    	lib/tasks/app/test.rake

commit 56092373ca335683901495c00196a0d6670a2bfb
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 14:26:16 2014 +0200

    [FIX CI]

commit 7c18f97671c3871b4fc0c5dfb701ff059b895aad
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 12:56:51 2014 +0200

    reducing sleeps to zero

commit da20a9f55499039e36e789c8b5a0d311541cd232
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 11:51:39 2014 +0200

    [FIX CI] hand_over/add.feature

commit 5f86ff9e703b6750c1f2ee35538171cf4d5baae2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 17 11:44:53 2014 +0200

    fix kalendar.feature

commit edf559adbd48f8da259a0fc4a5f86c4cd3ce21c8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 11:28:28 2014 +0200

    [FIX CI] acknowledge/edit_order_line.feature

commit 8f5b1db451ff84d8c9b11ec8668ec90de7d6f2a7
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 11:19:12 2014 +0200

    [FIX CI] probleme.feature

commit 313ecf4e6033bdf988fa21719062684cbf9d6240
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 11:16:09 2014 +0200

    [FIX CI] ausleihe.feature

commit de3bb8f196690af428e2f66e8f52bdcb7e510acf
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 11:10:29 2014 +0200

    [FIX CI] ruestliste.feature

commit 2afe1b7f92449c1bb8f8183d57848b47c9402e46
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 17 11:05:45 2014 +0200

    [FIX CI] tagesansicht.feature

commit 75faeab8d0bfcec014c639d7c00fbcd8363e15d9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 17 11:04:01 2014 +0200

    fix features/step_definitions/examples/kalendar_steps.rb

commit 866c69b792bf0a839758d6b3ef225d89bc49805c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:57:51 2014 +0200

    [CI] set auto trials to 1

commit bf97a347ffb7724c3166fdd963572860200826ef
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:39:56 2014 +0200

    [CI] remove strict definition, raise timeout to 5 minutes, generating 1 single personas dump

commit f3335044c42eb22dbec4e4aa6f58b9860f74d1a5
Merge: 5b63b37 02751e9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 16:39:21 2014 +0200

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

commit 5b63b37fb065c2caebff91744aa959e4cc3ce597
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 16:39:17 2014 +0200

    optimize edit_take_back_end_date.feature

commit 02751e9f748b4cbcfdb3bd8c1ae4071e61de5519
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:16:36 2014 +0200

    removing capybara-screenshot gem

commit 9773732f816ed21d046b7915b8a2aa24d484835d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:14:08 2014 +0200

    removing custom cucumber benchmark logs

commit 646572f1a5777aa8d55b5ea611355b872eb8177d
Merge: 5d90132 350a369
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 16:11:20 2014 +0200

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

commit 5d90132b9b0479d20175d1329f77855eddfe5399
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 16:11:16 2014 +0200

    fix add_item.feature

commit 350a369fab55e45df7227d8215cb875dcfc93701
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 16:05:38 2014 +0200

    refactoring text assertions from rspec to capybara

commit 7cebb120e99194e4afc758e64ddf5ce9133a7040
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 15:16:53 2014 +0200

    [FIX CI]

commit 990a9807515945fc9e8664baf7b975aff6744ad0
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 14:57:18 2014 +0200

    additional forgotten file from fix_inventory_list

commit 88c1847291dce071aeada0323b4ab96dbe7ae4d1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 16 14:51:51 2014 +0200

    fix inventory index list (squash merge of fix_inventory_list)

    Conflicts:
    	app/assets/javascripts/manage/controllers/inventory_index_controller.coffee
    	app/assets/javascripts/models/inventory.coffee
    	app/assets/javascripts/modules/rooted.coffee

commit 4b08b4d3f0db8ecd5b2fc180d8559ac8a1f83e3f
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 14:44:57 2014 +0200

    [FIX CI]

commit 59b7392dc7ab8355ed148300a83b86241b39d933
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 14:25:19 2014 +0200

    [FIX CI]

commit 30c0769c9357e0a304015923c2c166e766f4937a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 12:15:20 2014 +0200

    [FIX CI] aushaendigung.feature, ausleihe.feature, database.feature

commit 6886d153471ba12c313e6e1d3972e4c462342ff3
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 16 11:49:27 2014 +0200

    [FIX CI] gruppen.feature

commit 7d4df5c7d57ee2cc76c60e75642f79ad5aba8f0b
Merge: 2ed6b36 596e16e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 15 15:59:24 2014 +0200

    Merge branch 'master' into fix_3_trials

    Conflicts:
    	Gemfile.lock
    	cider-ci/bin/list_cucumber_tasks.rb
    	cider-ci/tasks/cucumber.yml
    	cider-ci/tasks/cucumber_scenarios.yml
    	cider-ci/tasks/cucumber_strict.yml
    	cider-ci/tasks/cucumber_subset.yml
    	features/examples/ausleihe.feature
    	features/personas/dumps/minimal_seed.sql

commit 2ed6b36bd3f6244831b04cc7a4164ec256ea69c7
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 15 15:55:12 2014 +0200

    Revert "Inventory Spine Model removed & Rooted Module simplified"

    This reverts commit ac1a50fd13fa4a95ef05200b508a3e3ec6e155aa.

commit ac1a50fd13fa4a95ef05200b508a3e3ec6e155aa
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 15 15:47:43 2014 +0200

    Inventory Spine Model removed & Rooted Module simplified

commit b79f4c37c13763cf4698b214b2f2070248ac4743
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 15:08:38 2014 +0200

    dumps

commit 778206ce5fd81f371bb6be18f7a6fb291c8789f2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 15:06:23 2014 +0200

    various fixes

commit 5530d279c216da40e4e614bcfa6e9cffd97d5732
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 13:58:14 2014 +0200

    move Array.class_eval to env.rb

commit 9a3a4f9b3f3ff740cd24fd70ee7d5842032b5104
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 11:46:33 2014 +0200

    fix test probleme.feature

commit faef95dff65864c144956b57484728db4f0323b1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 12 11:46:15 2014 +0200

    fix problems tooltip availability for groups frontend

commit 6b6285a4f8b6d06f0e7d822d233651f3b8ae7ee8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 15:46:40 2014 +0200

    overriding Array#shuffle and Array#sample with random based on TEST_DATETIME

commit 606213cb56d0eb23a5fd35b61e5f307a1c916751
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 15:12:43 2014 +0200

    just testing

commit 0c586c514ea37bbe7df8025a62cc6f3fc3413738
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 15:03:16 2014 +0200

    just testing

commit 971cee23f1d167f96a6450f702c0d470d251078b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 15:00:32 2014 +0200

    just testing

commit cec2fc082bf845bae71763a3e4d8aa39c04b25cb
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:57:27 2014 +0200

    just testing

commit 83693e6f3aa80e672ac49156870950da50cbdb38
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:55:09 2014 +0200

    just testing

commit 54c01de7094e983cfd0fea8a1aa41d808c0f6cac
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:50:41 2014 +0200

    just testing

commit 3eac856a8ca9316e36fad44af3a6ce261aa0b5c0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:47:10 2014 +0200

    small check of shuffle

commit 09fcd5a097d22c093708543d9e56a7116da0d6a9
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Sep 11 14:39:23 2014 +0200

    small check of srand

commit 17bfca5e3ab2e8787c0576d793301e3478f0c7b2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 13:37:18 2014 +0200

    merge branch fs_cucumber_browser

    Conflicts:
    	cider-ci/tasks/cucumber.yml
    	cider-ci/tasks/cucumber_scenarios.yml
    	cider-ci/tasks/cucumber_strict.yml
    	features/examples/aushaendigung.feature
    	features/examples/ruestliste.feature
    	features/personas/dumps/minimal_seed.sql
    	features/support/env_screenshots.rb

commit 80131b571df554dc05f0de4e1a0c3b04069b7956
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 13:04:57 2014 +0200

    @chrome for aushaendigung.feature

commit b91f928b03c418cd89566d0c3e43bc69f8122d07
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 13:03:10 2014 +0200

    fix add.feature

commit c4432874d49750eda731750622eba23152db8666
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 11:43:14 2014 +0200

    fix ruestliste.feature -> @chrome

commit d5caca0117c602b9197743430d0a6dae73a3377c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 11:38:27 2014 +0200

    fix features/manage/acknowledge/add_item.feature:25

commit e0e9f09bd575b63dd2706108739a3714989e1392
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 10:14:44 2014 +0200

    fix env screenshots#

commit 3ac2011c73eee37f6b0441e891187de9394debda
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 10:01:33 2014 +0200

    new dumps

commit 522d27738f4b20e7b1504bedf14aa351cbdaeb90
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 09:48:32 2014 +0200

    revert @chrome tag back to @firefox

commit b09788d8d79b4f29c02b6e02e47e8b79e7cd5c61
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 11 09:46:59 2014 +0200

    gem update selenium-webdriver

commit 28a49c6d5e2b7107beb4824103d89b55f0960018
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 13:57:03 2014 +0200

    try @chrome

commit b3df16af056be2172b0fa88aa8c386dbda129e7a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 12:20:30 2014 +0200

    features/support/env_screenshots.rb

commit adad79d4e997b037f07817f823a3d08ff664b871
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 11:36:31 2014 +0200

    testing autocomplete

commit 845f404a68c44e34866d799580a3853de9a44cbf
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 11:26:55 2014 +0200

    Revert "test hotspot feature"

    This reverts commit d82c5407b20ed03ca6848bbb0759bfa67c054450.

commit d82c5407b20ed03ca6848bbb0759bfa67c054450
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 10 11:23:35 2014 +0200

    test hotspot feature

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

    inventarhelfer steps fix

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

    fix kalender.feature

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

    fix paket item inventory helfer test

commit 7aeb3e7b1458ac29634baf54450292ac1c4dfdbf
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 6a306888dde6d1324d8f642c19781f8c3e7b62df
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 14:41:25 2014 +0200

    fix features/borrow/vorlagen.feature:45

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

    fix features/examples/ausleihe.feature:79

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

    fix hand over add.feature

commit d588f2880068a190c8c90c62bd827533f56b3753
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 2b4b74ff41bb39842c2f986f43a42fe0face731d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 9 10:59:18 2014 +0200

    regenerate scenario tasks with auto_trials: 2
Dealing with exit status properly.