mirror of
https://github.com/internetee/registry.git
synced 2025-06-10 06:34:46 +02:00
Merge branch 'master' of https://github.com/internetee/registry into 1804-upgrade-ui-tests-for-admin-portal-users
This commit is contained in:
commit
46d33330dc
6 changed files with 8 additions and 8 deletions
7
.github/workflows/ruby.yml
vendored
7
.github/workflows/ruby.yml
vendored
|
@ -17,7 +17,7 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-18.04]
|
os: [ubuntu-18.04]
|
||||||
ruby: [2.6, 2.7 ]
|
ruby: [ 2.7 ]
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
|
continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
|
||||||
steps:
|
steps:
|
||||||
|
@ -100,11 +100,6 @@ jobs:
|
||||||
- name: Give test coverage reporter executable permissions
|
- name: Give test coverage reporter executable permissions
|
||||||
run: chmod +x cc-test-reporter
|
run: chmod +x cc-test-reporter
|
||||||
|
|
||||||
- uses: actions/download-artifact@v1
|
|
||||||
with:
|
|
||||||
name: coverage-2.6
|
|
||||||
path: coverage
|
|
||||||
|
|
||||||
- uses: actions/download-artifact@v1
|
- uses: actions/download-artifact@v1
|
||||||
with:
|
with:
|
||||||
name: coverage-2.7
|
name: coverage-2.7
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
2.6.5
|
2.7.2
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
26.01.2021
|
||||||
|
* Ruby update to 2.7 [#1791](https://github.com/internetee/registry/issues/1791)
|
||||||
|
|
||||||
21.01.2021
|
21.01.2021
|
||||||
* Registrant API: optimised contact linking [#1807](https://github.com/internetee/registry/pull/1807)
|
* Registrant API: optimised contact linking [#1807](https://github.com/internetee/registry/pull/1807)
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM internetee/ruby:2.6-buster
|
FROM internetee/ruby:2.7-buster
|
||||||
|
|
||||||
RUN mkdir -p /opt/webapps/app/tmp/pids
|
RUN mkdir -p /opt/webapps/app/tmp/pids
|
||||||
WORKDIR /opt/webapps/app
|
WORKDIR /opt/webapps/app
|
||||||
|
|
|
@ -5,6 +5,7 @@ module I18n
|
||||||
alias_method :original_localize, :localize
|
alias_method :original_localize, :localize
|
||||||
|
|
||||||
def localize(object, options = {})
|
def localize(object, options = {})
|
||||||
|
options.merge!({ default: '-' })
|
||||||
object.present? ? original_localize(object, options) : ''
|
object.present? ? original_localize(object, options) : ''
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -20,6 +20,7 @@ class AdminAreaPricesTest < ApplicationSystemTestCase
|
||||||
fill_in 'Valid from', with: effective_date
|
fill_in 'Valid from', with: effective_date
|
||||||
click_on 'Create price'
|
click_on 'Create price'
|
||||||
|
|
||||||
|
|
||||||
assert_text 'Price has been created'
|
assert_text 'Price has been created'
|
||||||
assert_text I18n.localize(effective_date)
|
assert_text I18n.localize(effective_date)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue