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
6ebb77fb5c
Change contacts.email to NOT NULL
2018-08-16 16:09:07 +03:00
Maciej Szlosarczyk
0a0962e007
Write tests around API for domain lock
2018-08-10 14:18:24 +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
13f2bff8d0
Use setup callback
2018-08-09 15:05:28 +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
Artur Beljajev
db0ae116a0
Use setup callback
2018-08-09 14:29:03 +03:00
Maciej Szlosarczyk
faeeb55bc7
Add badges to locked domains
2018-08-09 13:57:31 +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
7ce092dff2
Add final assertion
...
To make sure that the domain is in the right state after out-of-order
execution of the lock removal
2018-08-08 15:49:37 +03:00
Maciej Szlosarczyk
dffe865d89
Add ability for admin to remove registry lock
2018-08-08 15:43:29 +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
