Commit graph

9 commits

Author SHA1 Message Date
Artur Beljajev
23c0d4f6ab Merge branch 'master' into add-contacts-email-constraint
# Conflicts:
#	db/structure.sql
2018-08-27 12:21:51 +03:00
Artur Beljajev
1f78856ea9 Merge branch 'master' into refactor-devise-integration 2018-08-25 17:29:00 +03:00
Artur Beljajev
d65186dc29 Disallow scheduling "force delete" procedure on a discarded domain 2018-08-21 18:52:27 +03:00
Artur Beljajev
ffd389790c Merge branch 'master' into registry-791 2018-08-21 12:08:45 +03:00
Artur Beljajev
6ebb77fb5c Change contacts.email to NOT NULL 2018-08-16 16:09:07 +03:00
Artur Beljajev
db0ae116a0 Use setup callback 2018-08-09 14:29:03 +03:00
Artur Beljajev
096035ae11 Revert old behaviour 2018-08-08 22:28:09 +03:00
Artur Beljajev
6de31605d9 Integrate master branch 2018-08-08 19:36:14 +03:00
Maciej Szlosarczyk
526a9ccd58
Change test structure to follow closer newer Rails 5 rules
* Create new class called ApplicationIntegrationTest, so we don't have
  to override ActionDispatch::IntegrationTest
* Move UI tests to inherit from ApplicationSystemTestCase
* Existing REST API or EPP tests inherit from
  ApplicationIntegrationTest.
* Move `require 'application_system_test_case'` at the end of
  `test_helper`

I don't particularly agree with the Rails' convention of treating UI
tests as system tests and API tests as integration tests, but I see no
benefit in actively fighting against it.
2018-07-27 09:36:27 +03:00