vue3, vuetify3

.github/workflows/tests.yml

@@ -39,7 +39,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y libvips
     - name: git checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: install ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -83,21 +83,21 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: nanasess/setup-chromedriver@v2
     - name: install libvips
       run: |
         sudo apt-get update
         sudo apt-get install -y libvips
     - name: git checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: install ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: '3.2.2'
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: install node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v4
       with:
         node-version: '20'
     - name: start websocker server
@@ -135,7 +135,7 @@ jobs:
         cd vue
         npm run test
     - name: upload e2e failure screenshots
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: ${{ always() }}
       with:
         name: e2ereport

app/assets/stylesheets/vtfy/typography.css

@@ -26,7 +26,7 @@ kbd{
 .theme--light.heading{
     color:rgba(0,0,0,.87)
 }
-.theme--dark.heading{
+.v-theme--dark.heading{
     color:#fff
 }
 ol,ul{

app/controllers/application_controller.rb

@@ -169,7 +169,7 @@ def boot_app(status: 200)
   def redirect_to(url, opts = {})
     return super unless url.is_a? String # GK: for now this override only covers cases where a string has been passed in, so it does not cover cases of a Hash or a Record being passed in
     host = URI(url).host
-    if ENV['USE_VUE'] && Rails.env.development? && host == "localhost"
+    if Rails.env.development? && host == "localhost"
       path = URI(url).path
       query = URI(url).query ? "?#{URI(url).query}" : ""
       super "http://localhost:8080#{path}#{query}"

app/controllers/dev/polls_controller.rb

@@ -56,7 +56,7 @@ def test_discussion
     sign_in group.admins.first
     discussion = saved fake_discussion(group: group, author: group.admins.first)
     DiscussionService.create(discussion: discussion, actor: discussion.author)
-    redirect_to discussion_path(discussion)
+    redirect_to discussion_url(discussion)
   end
 
   def test_poll_in_discussion

app/controllers/dev/scenarios/dashboard.rb

@@ -10,6 +10,7 @@ def setup_dashboard
   end
 
   def setup_dashboard_with_one_thread
+    create_another_group
     sign_in patrick
     recent_discussion
     redirect_to dashboard_url

config/locales/client.ar.yml

@@ -2178,7 +2178,7 @@ ar:
     account_locked: تم قفل حسابك بعد عدة محاولات تسجيل دخول فاشلة. تحقق من بريدك الإلكتروني للحصول على رابط إلغاء القفل
     email_not_found: عذرًا ، لم نتمكن من العثور على حساب بعنوان البريد الإلكتروني هذا
     email_taken: هذا البريد مسجل من قبل
-    email_placeholder: you@example.com
+    email_placeholder: you{'@'}example.com
     login_with_token: أنت جاهز تمامًا! اضغط على الرابط أدناه للمتابعة.
     login_link_helptext: انقر فوق الزر أدناه وسنرسل لك ارتباطًا لتسجيل الدخول.
     enter_your_password: أدخل كلمة المرور الخاصة بك للمتابعة

config/locales/client.da.yml

@@ -1783,7 +1783,7 @@ da:
     dots_remaining: "%{count} prikker tilbage"
     too_many_dots: Du har brugt for mange prikker
   auth_form:
-    email_placeholder: you@example.com
+    email_placeholder: you{'@'}example.com
     name_placeholder: Dit navn
     name: Navn
     email: Email

config/locales/client.el.yml

@@ -1570,7 +1570,7 @@ el:
     'no': Όχι
     accept: Αποδέχομαι
   auth_form:
-    email_placeholder: you@example.com
+    email_placeholder: you{'@'}example.com
     name_placeholder: Το όνομα σας
     code: '000000'
     youre_invited: Έχετε προσκληθεί να συμμετάσχετε στο %{group_name}.

config/locales/client.en.yml

@@ -1252,7 +1252,7 @@ en:
     subgroup_name: Subgroup name
     organization_name: Organization name
     handle: Handle
-    group_handle_placeholder: "For your group URL and email: %{host}/%{handle}, %{handle}@%{host}"
+    group_handle_placeholder: "For your group URL and email: %{host}/%{handle}, %{handle}{'@'}%{host}"
     start_organization_heading: New organization
     edit_organization_heading: Edit organization settings
     group_name_placeholder: 'What is the name of your group?'
@@ -1550,7 +1550,7 @@ en:
     announcement_label: Announcements
     announcement_description: "You will receive an email about all content that has been announced by people in your groups"
     mentioned_label: Mentions & Replies
-    mentioned_description: "When someone @mentions you in a comment or replies to you, you'll get a notification email"
+    mentioned_description: "When someone mentions you in a comment or replies to you, you'll get a notification email"
     update_settings: Save changes
     specific_groups: Settings for specific groups
     default_settings:
@@ -1818,6 +1818,10 @@ en:
     gradients_of_agreement_title: Gradients of agreement
 
   poll_option_form:
+    thumb_up: Thumb up
+    thumb_down: Thumb down
+    thumb_sideways: Thumb sideways
+    hand_up: Hand up
     edit_option: Edit option
     option_name: Option name
     option_name_hint: A short name for this option
@@ -2182,7 +2186,7 @@ en:
     option_added_please_add_details: Option added! Please add some details so people know what it means.
     default_duration_in_days: Default duration in days
     default_duration_in_days_hint: How many days should be given for people to vote?
-    how_many_options_can_a_voter_choose: How many of these options may a voter choose?
+    how_many_options_can_a_voter_choose: How many options may a voter choose?
     minimum_choices: Minimum choices
     maximum_choices: Maximum choices
     content: Content
@@ -2790,7 +2794,7 @@ en:
     account_locked: "Your account has been locked after too many failed login attempts. Check your email for an unlock link"
     email_not_found: "Sorry, we couldn't find an account with that email address"
     email_taken: Email address is already registered
-    email_placeholder: you@example.com
+    email_placeholder: you{'@'}example.com
     login_with_token: You're all set! Click the link below to continue.
     login_link_helptext: Click the button below and we'll send you a link to sign in.
     enter_your_password: "Enter your password to continue"

config/locales/client.he.yml

@@ -2027,7 +2027,7 @@ he:
     invalid_token: סליחה, אנחנו לא מסוגלים להשתמש בטוקן הזה כדי להכניס אותך. לחץ למטה לשלוח עוד אחד.
     account_locked: חשבונך ננעל אחרי נסיונות כושלים רבים מידי. בדוק במייל שלך לינק לביטול הנעילה
     email_not_found: סליחה, לא מצאנו חשבון עם כתובת המייל הזו
-    email_placeholder: you@example.com
+    email_placeholder: you{'@'}example.com
     login_with_token: 'אתה מוכן ומזומן! לחץ על הלינק למטה להמשיך. '
     login_link_helptext: לחץ על הכפתור למטה ואנחנו נשלח לך לינק להתחברות.
     check_spam_folder: אם המייל לא מגיע אליך בקרוב, בדוק בתיקיית הספאם.

config/locales/client.hu.yml

@@ -2150,7 +2150,7 @@ hu:
     account_locked: Túl sok sikertelen bejelentkezési kísérlet után zárolódott a fiókod. Ellenőrizze e-mail címét, hogy nincs-e kinyitási link
     email_not_found: Sajnos nem találtunk ilyen e-mail címmel rendelkező fiókot
     email_taken: Ez az email fiók már regisztrálva van
-    email_placeholder: you@example.com
+    email_placeholder: you{'@'}example.com
     login_with_token: Minden készen állsz A folytatáshoz kattintson az alábbi linkre.
     login_link_helptext: Kattintson az alábbi gombra, és küldünk egy linket a bejelentkezéshez.
     enter_your_password: Add meg a jelszavad a folytatáshoz

config/locales/client.ja.yml

@@ -1288,7 +1288,7 @@ ja:
     account_locked: ログイン試行が何度も失敗したため、アカウントはロックされました。メールでロック解除リンクを確認してください
     email_not_found: 申し訳ありませんが、そのメール アドレスを持つアカウントが見つかりませんでした
     email_taken: メールアドレスはすでに登録されています
-    email_placeholder: you@example.com
+    email_placeholder: you{'@'}example.com
     login_with_token: 準備は完了です!続行するには、下のリンクをクリックしてください。
     login_link_helptext: 下のボタンをクリックすると、サインインするためのリンクが送信されます。
     enter_your_password: 続行するにはパスワードを入力してください

config/locales/client.ko.yml

@@ -1937,7 +1937,7 @@ ko:
     account_locked: 로그인 시도가 너무 많이 실패하여 귀하의 계정이 잠겼습니다. 이메일에서 잠금 해제 링크를 확인하세요
     email_not_found: 죄송합니다. 해당 이메일 주소를 사용하는 계정을 찾을 수 없습니다.
     email_taken: 이메일 주소가 이미 등록되어 있습니다
-    email_placeholder: you@example.com
+    email_placeholder: you{'@'}example.com
     login_with_token: 모든 준비가 완료되었습니다. 계속하려면 아래 링크를 클릭하세요.
     login_link_helptext: 아래 버튼을 클릭하시면 로그인 링크를 보내드립니다.
     enter_your_password: 계속하려면 비밀번호를 입력하세요

config/locales/client.nl_NL.yml

@@ -2207,7 +2207,7 @@ nl_NL:
     account_locked: Je account is gedeactiveerd door te veel mislukte aanmeld pogingen. Kijk in je e-mail voor een activatie-link
     email_not_found: Helaas konden we geen account vinden met dat e-mailadres
     email_taken: E-mailadres is al geregistreerd
-    email_placeholder: you@example.com
+    email_placeholder: you{'@'}example.com
     login_with_token: Helemaal klaar! Klik op onderstaande link om verder te gaan.
     login_link_helptext: Klik op de knop hieronder en we sturen je een aanmeld-link.
     enter_your_password: Voer je wachtwoord in om door te gaan

config/locales/client.pl.yml

@@ -2222,7 +2222,7 @@ pl:
     account_locked: Twoje konto zostało zablokowane po zbyt wielu nieudanych próbach logowania. Sprawdź swój adres e-mail, aby uzyskać link do odblokowania.
     email_not_found: Przepraszamy, nie mogliśmy znaleźć konta powiązanego z tym adresem e-mail.
     email_taken: Ten adres e-mailowy jest już zarejestrowany
-    email_placeholder: you@example.com
+    email_placeholder: you{'@'}example.com
     login_with_token: Wszystko gotowe! Kliknij poniższy link, aby kontynuować.
     login_link_helptext: Kliknij poniższy przycisk, a my wyślemy Ci link do logowania.
     enter_your_password: Wprowadź hasło, aby kontynuować

config/locales/client.ru.yml

@@ -1683,7 +1683,7 @@ ru:
   auth_form:
     enter_your_name: Введите свое имя
     invalid_password: Извините, этот пароль не совпадает с тем, который у нас есть в файле
-    email_placeholder: You@example.com
+    email_placeholder: you{'@'}example.com
     name_placeholder: Ваше имя
     name: Название
     code: '000000'

config/locales/client.uk.yml

@@ -2247,7 +2247,7 @@ uk:
     account_locked: Ваш обліковий запис заблоковано після занадто багатьох спроб входу до системи. Перевірте свою електронну пошту, щодо посилання для розблокування.
     email_not_found: На жаль, ми не змогли знайти обліковий запис з цією адресою електронної пошти
     email_taken: Адреса електронної пошти вже зареєстрована
-    email_placeholder: you@example.com
+    email_placeholder: you{'@'}example.com
     login_with_token: Все готово! Натисніть посилання нижче, щоб продовжити.
     login_link_helptext: Натисніть кнопку нижче, і ми надішлемо вам посилання для входу.
     enter_your_password: Введіть свій пароль, щоб продовжити

config/locales/client.zh_TW.yml

@@ -1198,7 +1198,7 @@ zh_TW:
       group_updated: 群組已更新
     upload_logo: 上傳圖示
     upload_cover_photo: 上傳封面圖片
-    group_handle_placeholder: 您的群組 URL 和電子郵件：%{host}/%{handle}、%{handle}@%{host}
+    group_handle_placeholder: 您的群組 URL 和電子郵件：%{host}/%{handle}、%{handle}{'@'}%{host}
     new_description_placeholder: 為什麼要試試 Loomio？你們需要共同做出哪些決定？
     new_description_html: <h3 id="how-do-you-intend-to-use-loomio">您打算如何使用 Loomio？</h3><p></p><h3 id="why-is-this-important-for-your-group">為什麼這對您的團隊很重要？</h3><p></p><h3 id="what-decisions-do-you-need-to-make">您需要做出哪些決定？</h3><p></p>
     group_privacy_is_open_description: 公開上市。所有線程都是公共的。
@@ -2232,7 +2232,7 @@ zh_TW:
     account_locked: 您的帳號因為太多次失敗的登入嘗試而被鎖定。請檢查您的電子郵件以取得解鎖連結
     email_not_found: 抱歉，我們找不到與此電子郵件地址相關的帳號
     email_taken: 電子郵件位置已被註冊
-    email_placeholder: you@example.com
+    email_placeholder: you{'@'}example.com
     login_with_token: 您已經設定好了！點選下方的連結以繼續。
     login_link_helptext: 點選下方的按鈕，然後我們就會傳送連結給您以供登入。
     enter_your_password: 輸入您的密碼以繼續

vue/nightwatch.conf.js

@@ -1,6 +1,4 @@
 module.exports = {
-  // An array of folders (excluding subfolders) where your tests are located;
-  // if this is not specified, the test source must be passed as the second argument to the test runner.
   detailed_output: false,
   skip_testcases_on_fail: false,
   src_folders: ['tests/e2e/specs'],
@@ -11,45 +9,29 @@ module.exports = {
 
   test_settings: {
     default: {
+      "silent": true,
       disable_error_log: false,
       launch_url: 'http://localhost:8080',
 
       screenshots: {
-        enabled: false,
-        path: 'tests/screenshots',
-        on_failure: true
+        enabled: true,
+        path: './tests/screenshots',
+        on_failure: true,
+        on_error: true
       },
 
       desiredCapabilities: {
-        browserName: 'chrome'
+        browserName: 'chrome',
+        chromeOptions: {
+          args: ['headless', 'window-size=1280,6400']
+        }
       },
 
       webdriver: {
         start_process: true,
         server_path: ''
       },
     },
-
-    chrome: {
-      desiredCapabilities: {
-        browserName: 'chrome',
-        'goog:chromeOptions': {
-          // More info on Chromedriver: https://sites.google.com/a/chromium.org/chromedriver/
-          // w3c:false tells Chromedriver to run using the legacy JSONWire protocol (not required in Chrome 78)
-          // w3c: false,
-          args: ['headless', 'window-size=1280,2400']
-        }
-      },
-
-      webdriver: {
-        start_process: true,
-        server_path: '',
-        cli_args: [
-          // --verbose
-        ]
-      }
-    },
-
   },
 
 };