Maciej Szlosarczyk
2636fe2525
Merge branch 'master' into registry-927
2018-08-31 14:25:59 +03:00
Artur Beljajev
5b625fa440
Update fixture
2018-08-29 13:31:13 +03:00
Artur Beljajev
aff5b68a2f
Merge branch 'master' into refactor-messages
...
# Conflicts:
# db/structure.sql
2018-08-28 14:28:45 +03:00
Timo Võhmar
39fe8ef6ce
Merge pull request #936 from internetee/add-contacts-email-constraint
...
Change `contacts.email` to NOT NULL
2018-08-28 12:54:47 +03:00
Artur Beljajev
1bfdf899a0
Merge branch 'master' into refactor-messages
...
# Conflicts:
# db/structure.sql
2018-08-27 20:55:44 +03:00
Artur Beljajev
852d754eac
Fix tests
2018-08-27 16:52:30 +03:00
Artur Beljajev
3d51a93f95
Merge branch 'master' into registry-790
2018-08-27 15:24:05 +03:00
Artur Beljajev
d27443277f
Merge branch 'master' into improve-registrant-area
2018-08-27 12:23:09 +03:00
Artur Beljajev
23c0d4f6ab
Merge branch 'master' into add-contacts-email-constraint
...
# Conflicts:
# db/structure.sql
2018-08-27 12:21:51 +03:00
Maciej Szlosarczyk
8aa8aea24e
Merge branch 'master' into registry-927
2018-08-27 11:40:28 +03:00
Artur Beljajev
1f78856ea9
Merge branch 'master' into refactor-devise-integration
2018-08-25 17:29:00 +03:00
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
Maciej Szlosarczyk
0dc0ac4d16
Merge branch 'master' into registry-927
2018-08-24 12:58:29 +03:00
Artur Beljajev
8765baf319
Rename Message to Notification
2018-08-23 20:03:03 +03:00
Artur Beljajev
211f8c9143
Fix home page link
2018-08-22 00:21:12 +03:00
Artur Beljajev
a2a67159d4
Add assertion
2018-08-21 23:51:03 +03:00
Artur Beljajev
5c00a7364d
Improve readability
2018-08-21 23:50:29 +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
c48cdf68b6
Merge branch 'master' into registry-790
2018-08-20 21:20:52 +03:00
Artur Beljajev
eeec8dd331
Merge branch 'master' into improve-registrant-area
2018-08-17 22:19:07 +03:00
Artur Beljajev
773b2116ef
Merge branch 'master' into refactor-devise-integration
2018-08-17 14:54:23 +03:00
Maciej Szlosarczyk
07072ec6cb
Merge branch 'master' into registry-927
2018-08-17 11:28:41 +03:00
Artur Beljajev
6ebb77fb5c
Change contacts.email to NOT NULL
2018-08-16 16:09:07 +03:00
Artur Beljajev
c89cce6287
Do not show contact if given domain does not belong to the current user
2018-08-16 14:49:12 +03:00
Maciej Szlosarczyk
c028c0e477
Add more tests to deposit handling
2018-08-15 20:18:07 +03:00
Artur Beljajev
5a466206bf
Add registrant area tests
2018-08-15 12:58:31 +03:00
Maciej Szlosarczyk
b4b404888b
Disallow deposits that are lower than 0.01 EUR
2018-08-15 12:25:19 +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
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
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
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
Artur Beljajev
7a054ca893
Fix tests and specs
2018-07-13 23:12:01 +03:00
Maciej Szlosarczyk
3acd605b90
Change inheritance structure to match the one from Rails 5 more
...
In the future, ApplicationSystemTestCase should inherit from
ActionDispatch::SystemTestCase and JavaScriptApplicationSystemTestCase
could possibly be removed if the `driven_by` method works as it is
promised in Rails documentation:
http://api.rubyonrails.org/v5.2/classes/ActionDispatch/SystemTestCase.html
Consider introducing another class between
ActionDispatch::IntegrationTest and other items inheriting from it, as
the general Rails practice seems to have `ApplicationIntegrationTest`,
as we do have `ApplicationRecord` and `ApplicationController`.
2018-07-10 17:10:26 +03:00
