zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-13 04:59:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

made poll messaging separetly

Browse source
This commit is contained in:
oleghasjanov 2025-07-31 13:54:58 +03:00
parent 682d9f6de1
commit 7343e71096
3 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Dockerfile
View file

@ -1,4 +1,4 @@
FROM --platform=linux/amd64 ruby:3.0.3-slim-buster FROM --platform=linux/amd64 ruby:3.0.3-bullseye
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN apt-get update > /dev/null && apt-get install -y --no-install-recommends > /dev/null \ RUN apt-get update > /dev/null && apt-get install -y --no-install-recommends > /dev/null \
@ -29,27 +29,27 @@ RUN apt-get update > /dev/null && apt-get install -y --no-install-recommends > /
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# add repository for Node.js in the LTS version # add repository for Node.js in the LTS version
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
RUN apt-get install -y --no-install-recommends > /dev/null \ RUN apt-get install -y --no-install-recommends > /dev/null \
nodejs=* \ nodejs \
qt5-default=* \ qtbase5-dev \
libqt5webkit5-dev=* \ libqt5webkit5-dev \
gstreamer1.0-plugins-base=* \ gstreamer1.0-plugins-base \
libappindicator3-1=* \ libappindicator3-1 \
gstreamer1.0-tools=* \ gstreamer1.0-tools \
qtdeclarative5-dev=* \ qtdeclarative5-dev \
fonts-liberation=* \ fonts-liberation \
gstreamer1.0-x=* \ gstreamer1.0-x \
libasound2=* \ libasound2 \
libnspr4=* \ libnspr4 \
libnss3=* \ libnss3 \
libxss1=* \ libxss1 \
libxtst6=* \ libxtst6 \
xdg-utils=* \ xdg-utils \
qtdeclarative5-dev=* \ qtdeclarative5-dev \
fonts-liberation=* \ fonts-liberation \
gstreamer1.0-x=* \ gstreamer1.0-x \
wkhtmltopdf \ wkhtmltopdf \
libxslt1-dev \ libxslt1-dev \
libxml2-dev \ libxml2-dev \

10
app/controllers/admin/domains_controller.rb
View file

@ -119,11 +119,13 @@ module Admin
removed = old_statuses - new_statuses removed = old_statuses - new_statuses
added = new_statuses - old_statuses added = new_statuses - old_statuses
msg = [] added.each do |status|
msg << "Set on #{@domain.name}: #{added.join(', ')}" unless added.empty? @domain.registrar.notifications.create!(text: "#{status} set on domain #{@domain.name}")
msg << "Removed from #{@domain.name}: #{removed.join(', ')}" unless removed.empty? end
@domain.registrar.notifications.create!(text: msg.join('. ')) if msg.any? removed.each do |status|
@domain.registrar.notifications.create!(text: "#{status} is cancelled on domain #{@domain.name}")
end
end end
def build_associations def build_associations

8
test/integration/domain/domains_controller_test.rb
View file

@ -14,9 +14,13 @@ class DomainsControllerTest < ApplicationIntegrationTest
# Status OK is removed because, if: # Status OK is removed because, if:
# (statuses.length > 1) || !valid? # (statuses.length > 1) || !valid?
# then status OK is removed by manage_automatic_statuses method in domain.rb # then status OK is removed by manage_automatic_statuses method in domain.rb
assert_equal "Set on #{domains(:shop).name}: #{DomainStatus::PENDING_UPDATE}. Removed from #{domains(:shop).name}: #{DomainStatus::OK}", domains(:shop).registrar.notifications.last.text notifications = domains(:shop).registrar.notifications.last(2)
assert_equal "#{DomainStatus::PENDING_UPDATE} set on domain #{domains(:shop).name}", notifications.first.text
assert_equal "#{DomainStatus::OK} is cancelled on domain #{domains(:shop).name}", notifications.last.text
patch admin_domain_path(domains(:shop)), params: { domain: { statuses: [DomainStatus::PENDING_DELETE_CONFIRMATION] } } patch admin_domain_path(domains(:shop)), params: { domain: { statuses: [DomainStatus::PENDING_DELETE_CONFIRMATION] } }
assert_equal "Set on #{domains(:shop).name}: #{DomainStatus::PENDING_DELETE_CONFIRMATION}. Removed from #{domains(:shop).name}: #{DomainStatus::PENDING_UPDATE}", domains(:shop).registrar.notifications.last.text notifications = domains(:shop).registrar.notifications.last(2)
assert_equal "#{DomainStatus::PENDING_DELETE_CONFIRMATION} set on domain #{domains(:shop).name}", notifications.first.text
assert_equal "#{DomainStatus::PENDING_UPDATE} is cancelled on domain #{domains(:shop).name}", notifications.last.text
end end
end end