Commit graph

284 commits

Author SHA1 Message Date
Artur Beljajev
7ffc62e370 Merge branch 'master' into registry-623
# Conflicts:
#	test/integration/admin/registrars/show_registrar_test.rb
2018-04-12 17:16:58 +03:00
Timo Võhmar
9d128d0914
Merge pull request #818 from internetee/small-fix-for-l18n
Fix missing translation error in Mail templates page
2018-04-11 15:50:15 +03:00
Maciej Szlosarczyk
18ad5e8e5e
Fix missing translation error 2018-04-11 12:38:10 +03:00
Artur Beljajev
77135b34ba Merge branch 'tune-test-env' into registry-662
# Conflicts:
#	test/integration/registrar/bulk_change/nameserver_test.rb
#	test/integration/registrar/domain_transfers_test.rb
2018-04-06 00:44:24 +03:00
Artur Beljajev
228078a84e Add bulk replace to registrar area
#662
2018-04-06 00:16:17 +03:00
Artur Beljajev
8b8b8df394 Reset WebMock after integration tests 2018-04-05 16:06:10 +03:00
Artur Beljajev
5c34d9f468 Merge branch 'master' into registry-623 2018-04-04 16:32:17 +03:00
Artur Beljajev
ae4cae16d2 Merge branch 'tune-test-env' into registry-792 2018-04-04 15:37:26 +03:00
Artur Beljajev
2908fd512f Reset setting after each test 2018-04-04 15:26:51 +03:00
Artur Beljajev
c2aa9a815e Use setup/teardown blocks instead of methods
#792
2018-04-04 13:31:40 +03:00
Artur Beljajev
ea85731050 Merge branch 'tune-test-env' into registry-792 2018-04-04 13:30:40 +03:00
Artur Beljajev
817a672143 Reset time after each test 2018-04-04 01:43:40 +03:00
Artur Beljajev
f8eda810f9 Use setup/teardown blocks instead of methods 2018-04-04 01:42:59 +03:00
Artur Beljajev
af414c9267 Reorganize tests
#792
2018-04-03 18:01:56 +03:00
Artur Beljajev
f269796382 Show label in UI if a domain is discarded
#792
2018-04-03 15:22:20 +03:00
Artur Beljajev
d57c737a80 Convert specs to tests
#792
2018-04-02 09:13:53 +03:00
Artur Beljajev
7155d08f6e Fix test 2018-04-01 23:03:52 +03:00
Artur Beljajev
29a8f39cb6 Prohibit renewing an invalid domain
#678
2018-04-01 22:59:19 +03:00
Artur Beljajev
139b7f290d Update fixtures 2018-04-01 22:42:49 +03:00
Artur Beljajev
5cc16552ab Backport Rails 5 test assertions
#799
2018-04-01 22:41:48 +03:00
Artur Beljajev
837f326ef6 Merge branch 'master' into registry-623
# Conflicts:
#	app/controllers/admin/registrars_controller.rb
#	app/models/registrar.rb
#	app/views/admin/registrars/_billing.html.erb
#	app/views/admin/registrars/show.html.erb
#	config/locales/admin/registrars.en.yml
#	config/locales/en.yml
#	db/migrate/20180309053424_add_registrars_unique_constraints.rb
#	db/structure.sql
#	test/fixtures/registrars.yml
#	test/integration/admin/registrars/delete_test.rb
#	test/integration/admin/registrars/new_test.rb
#	test/models/registrar_test.rb
2018-03-29 12:13:59 +03:00
Artur Beljajev
0f6a47d73d Refactor registrars
#765
2018-03-26 07:00:54 +03:00
Artur Beljajev
69d0a20115 Fix tests
#623
2018-03-14 23:53:53 +02:00
Artur Beljajev
f8088df798 Fix tests
#623
2018-03-14 23:26:54 +02:00
Artur Beljajev
169c67839e Add "VATCode" and "TotalVAT" fields to Directo
#623
2018-03-14 14:48:20 +02:00
Artur Beljajev
e1b0f3044e Fix invoice
#623
2018-03-14 12:19:44 +02:00
Artur Beljajev
9a4380fd96 Fix invoice total calculation
#623
2018-03-13 14:32:38 +02:00
Artur Beljajev
beba81bc6d Introduce helper method
#623
2018-03-13 11:39:18 +02:00
Artur Beljajev
3ed6416e50 Fix test
#623
2018-03-13 11:32:44 +02:00
Artur Beljajev
b3c4f794d0 Reformat
#623
2018-03-13 11:32:35 +02:00
Artur Beljajev
b68fe6e312 Rename attributes
#623
2018-03-13 11:32:15 +02:00
Artur Beljajev
a73a8a0b89 Fix VAT rate
#623
2018-03-13 09:02:08 +02:00
Artur Beljajev
6dfd57ee2e Remove tests
#623
2018-03-13 08:47:08 +02:00
Artur Beljajev
6b54dd520d Enhance test
#623
2018-03-12 12:19:20 +02:00
Artur Beljajev
8d4b2d902b Convert specs to tests
#623
2018-03-12 11:36:07 +02:00
Artur Beljajev
7cc479c3fe Update fixtures
#623
2018-03-12 11:35:34 +02:00
Artur Beljajev
57ab19d86a Improve readability
#623
2018-03-12 11:34:41 +02:00
Artur Beljajev
4a63a60433 Return VAT rate as BigDecimal
#623
2018-03-12 10:17:15 +02:00
Artur Beljajev
7d72d9cb34 Fix vat rate
#623
2018-03-11 19:33:21 +02:00
Artur Beljajev
c129598d2b Improve VAT rate validation
#623
2018-03-10 16:51:11 +02:00
Artur Beljajev
7acd41595c Merge branch 'registry-772' into registry-623
# Conflicts:
#	app/models/invoice.rb
#	db/structure.sql
2018-03-10 16:48:47 +02:00
Artur Beljajev
efaac16cee Remove unused attribute
#772
2018-03-10 16:33:35 +02:00
Artur Beljajev
d6d20a81a9 Add registrar vat rate
#623
2018-03-09 13:08:36 +02:00
Artur Beljajev
4f51f6c736 Merge branch 'registry-765' into registry-623
# Conflicts:
#	app/models/registrar.rb
#	config/locales/en.yml
#	spec/models/registrar_spec.rb
#	test/models/registrar_test.rb
2018-03-09 09:30:05 +02:00
Artur Beljajev
a5869e0eca Refactor registrars
#765
2018-03-09 09:23:21 +02:00
Artur Beljajev
ffc32b66de Merge branch 'master' into registry-623
# Conflicts:
#	db/structure.sql
2018-03-08 13:04:11 +02:00
Artur Beljajev
046b9e96ce Improve readability
#746
2018-03-06 13:11:22 +02:00
Artur Beljajev
5319243e09 Convert spec to test
#746
2018-03-06 13:08:18 +02:00
Artur Beljajev
a910165bc9 Fix sporadic errors in tests
#746
2018-03-06 12:13:21 +02:00
Artur Beljajev
d42bdfbc0f Improve tests
#746
2018-03-06 11:05:08 +02:00