Merge branch 'master' of https://github.com/internetee/registry into 1804-upgrade-ui-tests-for-admin-portal-users

This commit is contained in:
Oleg Hasjanov 2021-01-26 14:43:09 +02:00
commit 46d33330dc
6 changed files with 8 additions and 8 deletions

View file

@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-18.04]
ruby: [2.6, 2.7 ]
ruby: [ 2.7 ]
runs-on: ${{ matrix.os }}
continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
steps:
@ -100,11 +100,6 @@ jobs:
- name: Give test coverage reporter executable permissions
run: chmod +x cc-test-reporter
- uses: actions/download-artifact@v1
with:
name: coverage-2.6
path: coverage
- uses: actions/download-artifact@v1
with:
name: coverage-2.7

View file

@ -1 +1 @@
2.6.5
2.7.2

View file

@ -1,3 +1,6 @@
26.01.2021
* Ruby update to 2.7 [#1791](https://github.com/internetee/registry/issues/1791)
21.01.2021
* Registrant API: optimised contact linking [#1807](https://github.com/internetee/registry/pull/1807)

View file

@ -1,4 +1,4 @@
FROM internetee/ruby:2.6-buster
FROM internetee/ruby:2.7-buster
RUN mkdir -p /opt/webapps/app/tmp/pids
WORKDIR /opt/webapps/app

View file

@ -5,6 +5,7 @@ module I18n
alias_method :original_localize, :localize
def localize(object, options = {})
options.merge!({ default: '-' })
object.present? ? original_localize(object, options) : ''
end
end

View file

@ -20,6 +20,7 @@ class AdminAreaPricesTest < ApplicationSystemTestCase
fill_in 'Valid from', with: effective_date
click_on 'Create price'
assert_text 'Price has been created'
assert_text I18n.localize(effective_date)
end