7 commits

Author	SHA1	Message	Date
Artur Beljajev	4b2948986b	Merge branch 'master' into registry-790 ... # Conflicts: # test/models/domain/force_delete_test.rb # test/system/admin_area/domains/force_delete_test.rb	2018-08-24 14:54:41 +03:00
Artur Beljajev	d65186dc29	Disallow scheduling "force delete" procedure on a discarded domain	2018-08-21 18:52:27 +03:00
Artur Beljajev	5338e59a2e	Fix tests	2018-08-21 12:48:08 +03:00
Artur Beljajev	ffd389790c	Merge branch 'master' into registry-791	2018-08-21 12:08:45 +03:00
Artur Beljajev	732997bf9e	Merge branch 'registry-791' into registry-790 ... # Conflicts: # app/views/admin/domains/edit.html.erb # config/locales/admin/domains.en.yml	2018-08-09 16:42:43 +03:00
Artur Beljajev	1d79f6548d	Merge branch 'master' into registry-790 ... # Conflicts: # test/integration/epp/domain/domain_delete_test.rb # test/integration/epp/domain/domain_update_test.rb # test/integration/epp/domain/transfer/request_test.rb # test/system/admin_area/domains_test.rb	2018-08-09 15:01:23 +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