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
Maciej Szlosarczyk
256d2b7de4
Add test for error in business registry
2018-08-09 15:24:21 +03:00
Artur Beljajev
13f2bff8d0
Use setup callback
2018-08-09 15:05:28 +03:00
Maciej Szlosarczyk
4cc0669286
Add business registry support for contacts controller
2018-08-09 15:04:22 +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
dbace4cbc5
Merge branch 'master' into refactor-devise-integration
2018-08-09 14:51:22 +03:00
Artur Beljajev
db0ae116a0
Use setup callback
2018-08-09 14:29:03 +03:00
Maciej Szlosarczyk
9dd9d4b1d6
Merge branch 'master' into registrant-api-contacts-controller
2018-08-09 14:05:27 +03:00
Timo Võhmar
71c74a66f8
Merge pull request #926 from internetee/registry-922
...
Registrant API domain endpoint
2018-08-09 14:03:36 +03:00
Timo Võhmar
015e620260
Merge pull request #921 from internetee/registry-918
...
Registrant API authentication
2018-08-09 14:02:57 +03:00
Maciej Szlosarczyk
faeeb55bc7
Add badges to locked domains
2018-08-09 13:57:31 +03:00
Artur Beljajev
1d95c1ccbc
Use standard login form
2018-08-09 13:43:11 +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
611e568488
Merge branch 'registry-918' into registry-927
2018-08-08 15:45:05 +03:00
Maciej Szlosarczyk
dffe865d89
Add ability for admin to remove registry lock
2018-08-08 15:43:29 +03:00
Artur Beljajev
bf3b54367b
Merge branch 'master' into refactor-devise-integration
2018-08-08 14:13:53 +03:00
Artur Beljajev
9225d30914
Remove dead code
2018-08-08 13:56:14 +03:00
Artur Beljajev
3fc55866b2
Use setup callback
2018-08-08 13:55:54 +03:00
Artur Beljajev
4ad02ddc34
Merge branch 'master' into improve-contact-tests
2018-08-08 13:54:48 +03:00
Maciej Szlosarczyk
544c8565c5
Merge branch 'master' into registry-927
2018-08-08 09:40:57 +03:00
Maciej Szlosarczyk
961c57563f
Merge branch 'registry-918' into registry-922
2018-08-08 09:15:40 +03:00
Maciej Szlosarczyk
06dc954167
Make tests inherit from ApplicationIntegrationTest class
2018-08-08 09:15:18 +03:00
Maciej Szlosarczyk
8736366a41
Merge branch 'registry-918' into registrant-api-contacts-controller
2018-08-08 09:14:11 +03:00
Maciej Szlosarczyk
e1881685b7
Make tests inherit from ApplicationIntegrationTest class
2018-08-08 09:13:46 +03:00
Maciej Szlosarczyk
133a11977e
Merge branch 'master' into registry-918
2018-08-08 09:06:32 +03:00
Artur Beljajev
f73a2551d3
Improve readability
2018-08-07 22:53:02 +03:00
Artur Beljajev
738785fcb9
Add contact tests
2018-08-07 16:41:11 +03:00
Maciej Szlosarczyk
f4c2919193
Merge branch 'registry-918' into registry-927
2018-08-07 15:33:01 +03:00
Maciej Szlosarczyk
abb1ad60e8
Update failing test
2018-08-07 15:09:18 +03:00
Maciej Szlosarczyk
0798001725
Make returned API errors more consistent
2018-08-07 15:04:37 +03:00
Maciej Szlosarczyk
de9b1517b0
Merge branch 'registry-918' into registrant-api-contacts-controller
2018-08-07 14:57:58 +03:00
Maciej Szlosarczyk
e3807f694d
Merge branch 'registry-918' into registry-922
2018-08-07 14:54:16 +03:00
Maciej Szlosarczyk
ad8dfcc28f
Make authentication errors more consistent with other errors
2018-08-07 14:52:33 +03:00
Maciej Szlosarczyk
43f65cc0aa
Add Domain::Lockable concern
2018-08-06 15:56:17 +03:00
Maciej Szlosarczyk
3673c69319
Add Registrant/Contacts endpoint
2018-08-01 14:57:41 +03:00
Maciej Szlosarczyk
5c39cb6917
Merge branch 'registry-918' into registry-922
2018-07-31 15:29:36 +03:00
Maciej Szlosarczyk
c476680a91
Add pagination to index
2018-07-31 15:14:21 +03:00
Maciej Szlosarczyk
10d42a0d74
Add domain index action (without pagination yet)
2018-07-30 15:09:48 +03:00
Maciej Szlosarczyk
13562aeb06
Move file to another folder
2018-07-30 13:56:54 +03:00
Maciej Szlosarczyk
c1ea79615f
Make API return errors array
2018-07-30 11:07:44 +03:00
Maciej Szlosarczyk
ed1afb78f6
Make tests conform with #924
2018-07-30 10:30:57 +03:00
Artur Beljajev
cc36e3ccea
Forbid cancelling force delete procedure when a domain is discarded
2018-07-29 20:42:29 +03:00
Artur Beljajev
4b30234c86
Merge branch 'registry-791' into registry-790
2018-07-27 16:18:28 +03:00
Maciej Szlosarczyk
b33ad0d4e8
Add show action
2018-07-27 11:00:35 +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
Maciej Szlosarczyk
0ab9f6333f
Add API/Registrant/Domains route
2018-07-26 14:46:03 +03:00
Artur Beljajev
e21d428afd
Merge branch 'master' into registry-791
2018-07-25 13:27:21 +03:00
Maciej Szlosarczyk
82d5349c02
Merge branch 'master' into registry-918
2018-07-24 16:57:26 +03:00