diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa94465faf..b5a33d7a45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,12 +57,14 @@ jobs: fetch-depth: 1 - name: Setup Git - run: git config --global user.email "ci@ci.invalid" && git config --global user.name "Discourse CI" + run: | + git config --global user.email "ci@ci.invalid" + git config --global user.name "Discourse CI" - name: Setup packages if: env.BUILD_TYPE != 'LINT' run: | - sudo apt-get -yqq install postgresql-client libpq-dev gifsicle jpegoptim optipng jhead && \ + sudo apt-get -yqq install postgresql-client libpq-dev gifsicle jpegoptim optipng jhead wget -qO- https://raw.githubusercontent.com/discourse/discourse_docker/master/image/base/install-pngquant | sudo sh - name: Setup redis @@ -78,7 +80,10 @@ jobs: architecture: 'x64' - name: Setup bundler - run: gem install bundler -v 2.1.1 --no-doc + run: | + gem install bundler -v 2.1.4 --no-doc + bundle config deployment 'true' + bundle config without 'development' - name: Bundler cache uses: actions/cache@v1 @@ -90,7 +95,7 @@ jobs: ${{ runner.os }}-gem- - name: Setup gems - run: bundle install --without development --deployment --jobs 4 --retry 3 + run: bundle install --jobs 4 - name: Get yarn cache directory id: yarn-cache-dir @@ -114,11 +119,15 @@ jobs: - name: Create database if: env.BUILD_TYPE != 'LINT' - run: bin/rake db:create && bin/rake db:migrate + run: | + bin/rake db:create + bin/rake db:migrate - name: Create parallel databases if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'CORE' - run: bin/rake parallel:create && bin/rake parallel:migrate + run: | + bin/rake parallel:create + bin/rake parallel:migrate - name: Rubocop if: env.BUILD_TYPE == 'LINT' @@ -126,7 +135,9 @@ jobs: - name: ESLint if: env.BUILD_TYPE == 'LINT' - run: yarn eslint app/assets/javascripts test/javascripts && yarn eslint --ext .es6 app/assets/javascripts test/javascripts plugins + run: | + yarn eslint app/assets/javascripts test/javascripts + yarn eslint --global I18n --ext .es6 plugins - name: Prettier if: env.BUILD_TYPE == 'LINT' @@ -136,7 +147,9 @@ jobs: - name: Core RSpec if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'CORE' - run: bin/turbo_rspec && bin/rake plugin:spec + run: | + bin/turbo_rspec + bin/rake plugin:spec - name: Plugin RSpec if: env.BUILD_TYPE == 'BACKEND' && env.TARGET == 'PLUGINS' diff --git a/.gitignore b/.gitignore index 97d1a6b930..2ef99613b6 100644 --- a/.gitignore +++ b/.gitignore @@ -137,4 +137,7 @@ node_modules openapi/* # ember-cli generated -dist \ No newline at end of file +dist + +# Copyright Deposits +copyright diff --git a/.rubocop.yml b/.rubocop.yml index 0cb02e3e97..d46296cf88 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,357 +1,2 @@ -require: - - rubocop-discourse - - rubocop-rspec - -AllCops: - TargetRubyVersion: 2.6 - DisabledByDefault: true - Exclude: - - "db/schema.rb" - - "bundle/**/*" - - "vendor/**/*" - - "node_modules/**/*" - - "public/**/*" - - "plugins/**/gems/**/*" - -Discourse: - Enabled: true - -Discourse/NoChdir: - Exclude: - - 'spec/**/*' # Specs are run sequentially, so chdir can be used - - 'plugins/*/spec/**/*' - -# Prefer &&/|| over and/or. -Style/AndOr: - Enabled: true - -Style/FrozenStringLiteralComment: - Enabled: true - -# Align `when` with `case`. -Layout/CaseIndentation: - Enabled: true - -# Align comments with method definitions. -Layout/CommentIndentation: - Enabled: true - -# No extra empty lines. -Layout/EmptyLines: - Enabled: true - -# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }. -Style/HashSyntax: - Enabled: true - -# Two spaces, no tabs (for indentation). -Layout/IndentationWidth: - Enabled: true - -Layout/SpaceAfterColon: - Enabled: true - -Layout/SpaceAfterComma: - Enabled: true - -Layout/SpaceAroundEqualsInParameterDefault: - Enabled: true - -Layout/SpaceAroundKeyword: - Enabled: true - -Layout/SpaceAroundOperators: - Enabled: true - -Layout/SpaceBeforeFirstArg: - Enabled: true - -# Defining a method with parameters needs parentheses. -Style/MethodDefParentheses: - Enabled: true - -# Use `foo {}` not `foo{}`. -Layout/SpaceBeforeBlockBraces: - Enabled: true - -# Use `foo { bar }` not `foo {bar}`. -Layout/SpaceInsideBlockBraces: - Enabled: true - -# Use `{ a: 1 }` not `{a:1}`. -Layout/SpaceInsideHashLiteralBraces: - Enabled: true - -Layout/SpaceInsideParens: - Enabled: true - -# Detect hard tabs, no hard tabs. -Layout/IndentationStyle: - Enabled: true - -# Blank lines should not have any spaces. -Layout/TrailingEmptyLines: - Enabled: true - -# No trailing whitespace. -Layout/TrailingWhitespace: - Enabled: true - -Lint/Debugger: - Enabled: true - -Layout/BlockAlignment: - Enabled: true - -# Align `end` with the matching keyword or starting expression except for -# assignments, where it should be aligned with the LHS. -Layout/EndAlignment: - Enabled: true - EnforcedStyleAlignWith: variable - -# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg. -Lint/RequireParentheses: - Enabled: true - -Lint/ShadowingOuterLocalVariable: - Enabled: true - -Layout/MultilineMethodCallIndentation: - Enabled: true - EnforcedStyle: indented - -Layout/HashAlignment: - Enabled: true - -Bundler/OrderedGems: - Enabled: false - -Style/SingleLineMethods: - Enabled: true - -Style/Semicolon: - Enabled: true - AllowAsExpressionSeparator: true - -Style/RedundantReturn: - Enabled: true - -Style/GlobalVars: - Enabled: true - Severity: warning - Exclude: - - 'lib/tasks/**/*' - - 'script/**/*' - - 'spec/**/*.rb' - - 'plugins/*/spec/**/*' - -# Specs - -RSpec/AnyInstance: - Enabled: false # To be decided - -RSpec/AroundBlock: - Enabled: true - -RSpec/BeforeAfterAll: - Enabled: false # To be decided - -RSpec/ContextMethod: - Enabled: false # TODO - -RSpec/ContextWording: - Enabled: false # To be decided - -RSpec/DescribeClass: - Enabled: false # To be decided - -RSpec/DescribeMethod: - Enabled: true - -RSpec/DescribeSymbol: - Enabled: false # To be decided - -RSpec/DescribedClass: - Enabled: false # To be decided - -RSpec/DescribedClassModuleWrapping: - Enabled: false # To be decided - -RSpec/EmptyExampleGroup: - Enabled: true - Exclude: - - 'spec/requests/api/*' - -RSpec/EmptyLineAfterExample: - Enabled: false # TODO - -RSpec/EmptyLineAfterExampleGroup: - Enabled: false # TODO - -RSpec/EmptyLineAfterFinalLet: - Enabled: false # TODO - -RSpec/EmptyLineAfterHook: - Enabled: false # TODO - -RSpec/EmptyLineAfterSubject: - Enabled: false # TODO - -RSpec/ExampleLength: - Enabled: false # To be decided - -RSpec/ExampleWithoutDescription: - Enabled: true - -RSpec/ExampleWording: - Enabled: false # TODO - -RSpec/ExpectActual: - Enabled: true - -RSpec/ExpectChange: - Enabled: false # To be decided - -RSpec/ExpectInHook: - Enabled: false # To be decided - -RSpec/ExpectOutput: - Enabled: true - -RSpec/FilePath: - Enabled: false # To be decided - -RSpec/Focus: - Enabled: true - -RSpec/HookArgument: - Enabled: false # TODO - -RSpec/HooksBeforeExamples: - Enabled: false # TODO - -RSpec/ImplicitBlockExpectation: - Enabled: true - -RSpec/ImplicitExpect: - Enabled: false # To be decided - -RSpec/ImplicitSubject: - Enabled: false # To be decided - -RSpec/InstanceSpy: - Enabled: true - -RSpec/InstanceVariable: - Enabled: false # TODO - -RSpec/InvalidPredicateMatcher: - Enabled: true - -RSpec/ItBehavesLike: - Enabled: true - -RSpec/IteratedExpectation: - Enabled: false # To be decided - -RSpec/LeadingSubject: - Enabled: false # TODO - -RSpec/LeakyConstantDeclaration: - Enabled: false # To be decided - -RSpec/LetBeforeExamples: - Enabled: false # TODO - -RSpec/LetSetup: - Enabled: false # TODO - -RSpec/MessageChain: - Enabled: true - -RSpec/MessageSpies: - Enabled: true - -RSpec/MissingExampleGroupArgument: - Enabled: true - -RSpec/MultipleDescribes: - Enabled: false # TODO - -RSpec/MultipleSubjects: - Enabled: true - -RSpec/NamedSubject: - Enabled: false # To be decided - -RSpec/NestedGroups: - Enabled: false # To be decided - -RSpec/OverwritingSetup: - Enabled: true - -RSpec/ReceiveCounts: - Enabled: true - -RSpec/ReceiveNever: - Enabled: true - -RSpec/RepeatedDescription: - Enabled: false # TODO - -RSpec/RepeatedExample: - Enabled: false # TODO - -RSpec/RepeatedExampleGroupBody: - Enabled: false # TODO - -RSpec/RepeatedExampleGroupDescription: - Enabled: false # TODO - -RSpec/ReturnFromStub: - Enabled: true - -RSpec/ScatteredSetup: - Enabled: false # TODO - -RSpec/SharedContext: - Enabled: true - -RSpec/SharedExamples: - Enabled: true - -RSpec/SingleArgumentMessageChain: - Enabled: true - -RSpec/SubjectStub: - Enabled: true - -RSpec/UnspecifiedException: - Enabled: true - -RSpec/VerifiedDoubles: - Enabled: true - -RSpec/VoidExpect: - Enabled: true - -RSpec/Yield: - Enabled: true - -Capybara/CurrentPathExpectation: - Enabled: true - -Capybara/FeatureMethods: - Enabled: true - -FactoryBot/AttributeDefinedStatically: - Enabled: true - -FactoryBot/CreateList: - Enabled: true - -FactoryBot/FactoryClassName: - Enabled: true - -Rails/HttpStatus: - Enabled: true +inherit_gem: + rubocop-discourse: default.yml diff --git a/.template-lintrc.js b/.template-lintrc.js index d7b4a104eb..adf0ccad1f 100644 --- a/.template-lintrc.js +++ b/.template-lintrc.js @@ -8,7 +8,6 @@ module.exports = { rules: { "block-indentation": true, "deprecated-render-helper": true, - "require-valid-alt-text": false, "linebreak-style": true, "link-rel-noopener": "strict", "no-abstract-roles": true, diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7119b6cd2e..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,86 +0,0 @@ -language: ruby - -git: - depth: false - -branches: - only: - - master - - beta - - stable - -env: - global: - - TRAVIS_NODE_VERSION="10" - - DISCOURSE_HOSTNAME=www.example.com - - RUBY_GLOBAL_METHOD_CACHE_SIZE=131072 - matrix: - - "RAILS_MASTER=0 QUNIT_RUN=0 RUN_LINT=0" - - "RAILS_MASTER=0 QUNIT_RUN=1 RUN_LINT=0" - - "RAILS_MASTER=0 QUNIT_RUN=0 RUN_LINT=1" - -addons: - chrome: stable - postgresql: "9.6" - apt: - update: true - packages: - - gifsicle - - jpegoptim - - optipng - - jhead - -matrix: - fast_finish: true - -rvm: - - 2.6.3 - -services: - - redis-server - -sudo: required -dist: xenial - -cache: - yarn: true - directories: - - vendor/bundle - -before_install: - - wget -qO- https://raw.githubusercontent.com/discourse/discourse_docker/master/image/base/install-pngquant | sudo sh - - nvm install node - - node --version - - gem install bundler -v 1.17.3 - - git clone --depth=1 https://github.com/discourse/discourse-backup-uploads-to-s3.git plugins/discourse-backup-uploads-to-s3 - - git clone --depth=1 https://github.com/discourse/discourse-spoiler-alert.git plugins/discourse-spoiler-alert - - git clone --depth=1 https://github.com/discourse/discourse-cakeday.git plugins/discourse-cakeday - - git clone --depth=1 https://github.com/discourse/discourse-canned-replies.git plugins/discourse-canned-replies - - git clone --depth=1 https://github.com/discourse/discourse-chat-integration.git plugins/discourse-chat-integration - - git clone --depth=1 https://github.com/discourse/discourse-assign.git plugins/discourse-assign - - git clone --depth=1 https://github.com/discourse/discourse-patreon.git plugins/discourse-patreon - - git clone --depth=1 https://github.com/discourse/discourse-user-notes.git plugins/discourse-user-notes - - git clone --depth=1 https://github.com/discourse/discourse-group-tracker - - export PATH=$HOME/.yarn/bin:$PATH - -install: - - bash -c "if [ '$RAILS_MASTER' == '1' ]; then bundle update --retry=3 --jobs=3 arel rails seed-fu; fi" - - bash -c "if [ '$RAILS_MASTER' == '0' ]; then bundle install --without development --deployment --retry=3 --jobs=3; fi" - - bash -c "if [ '$QUNIT_RUN' == '1' ] || [ '$RUN_LINT' == '1' ]; then yarn install --dev; fi" - - bash -c "if [ '$RUN_LINT' != '1' ]; then bundle exec rake db:create && LOAD_PLUGINS=1 bundle exec rake db:migrate; fi" - -script: - - | - bash -c " - if [ '$RUN_LINT' == '1' ]; then - npx lefthook run lints - else - if [ '$QUNIT_RUN' == '1' ]; then - bundle exec rake qunit:test['1200000'] && \ - bundle exec rake qunit:test['1200000','/wizard/qunit'] && \ - bundle exec rake plugin:qunit - else - bundle exec rspec && bundle exec rake plugin:spec - fi - fi - " diff --git a/Gemfile b/Gemfile index 742bf82d0b..a80f23dbc0 100644 --- a/Gemfile +++ b/Gemfile @@ -18,13 +18,13 @@ else # this allows us to include the bits of rails we use without pieces we do not. # # To issue a rails update bump the version number here - gem 'actionmailer', '6.0.2.2' - gem 'actionpack', '6.0.2.2' - gem 'actionview', '6.0.2.2' - gem 'activemodel', '6.0.2.2' - gem 'activerecord', '6.0.2.2' - gem 'activesupport', '6.0.2.2' - gem 'railties', '6.0.2.2' + gem 'actionmailer', '6.0.3' + gem 'actionpack', '6.0.3' + gem 'actionview', '6.0.3' + gem 'activemodel', '6.0.3' + gem 'activerecord', '6.0.3' + gem 'activesupport', '6.0.3' + gem 'railties', '6.0.3' gem 'sprockets-rails' end @@ -127,11 +127,7 @@ gem 'mini_racer' # TODO: determine why highline is being held back and upgrade to latest gem 'highline', '~> 1.7.0', require: false -# TODO: Upgrading breaks Sidekiq Web -# This is a bit of a hornets nest cause in an ideal world we much prefer -# if Sidekiq reused session and CSRF mitigation with Discourse on the -# _forum_session cookie instead of a rack.session cookie -gem 'rack', '2.0.8' +gem 'rack', '2.2.2' gem 'rack-protection' # security gem 'cbor', require: false @@ -172,9 +168,7 @@ group :test, :development do gem 'shoulda-matchers', require: false gem 'rspec-html-matchers' gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri - gem 'rubocop', require: false gem "rubocop-discourse", require: false - gem "rubocop-rspec", require: false gem 'parallel_tests' gem 'rswag-specs' @@ -254,3 +248,5 @@ end gem 'webpush', require: false gem 'colored2', require: false gem 'maxminddb' + +gem 'rails_failover', require: false diff --git a/Gemfile.lock b/Gemfile.lock index d16ced6284..26cce0e8f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,21 +1,21 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (6.0.2.2) - actionpack (= 6.0.2.2) - actionview (= 6.0.2.2) - activejob (= 6.0.2.2) + actionmailer (6.0.3) + actionpack (= 6.0.3) + actionview (= 6.0.3) + activejob (= 6.0.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.2.2) - actionview (= 6.0.2.2) - activesupport (= 6.0.2.2) + actionpack (6.0.3) + actionview (= 6.0.3) + activesupport (= 6.0.3) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.2.2) - activesupport (= 6.0.2.2) + actionview (6.0.3) + activesupport (= 6.0.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -24,20 +24,20 @@ GEM actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (6.0.2.2) - activesupport (= 6.0.2.2) + activejob (6.0.3) + activesupport (= 6.0.3) globalid (>= 0.3.6) - activemodel (6.0.2.2) - activesupport (= 6.0.2.2) - activerecord (6.0.2.2) - activemodel (= 6.0.2.2) - activesupport (= 6.0.2.2) - activesupport (6.0.2.2) + activemodel (6.0.3) + activesupport (= 6.0.3) + activerecord (6.0.3) + activemodel (= 6.0.3) + activesupport (= 6.0.3) + activesupport (6.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.2) + zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) annotate (3.1.1) @@ -66,7 +66,7 @@ GEM barber (0.12.2) ember-source (>= 1.0, < 3.1) execjs (>= 1.2, < 3) - better_errors (2.7.0) + better_errors (2.7.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) @@ -151,9 +151,8 @@ GEM concurrent-ruby (~> 1.0) image_size (1.5.0) in_threads (1.5.4) - jaro_winkler (1.5.4) jmespath (1.4.0) - jquery-rails (4.3.5) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -184,19 +183,19 @@ GEM mini_mime (>= 0.1.1) maxminddb (0.1.22) memory_profiler (0.9.14) - message_bus (3.1.0) + message_bus (3.2.0) rack (>= 1.1.3) method_source (1.0.0) mini_mime (1.0.2) mini_portile2 (2.4.0) - mini_racer (0.2.10) + mini_racer (0.2.14) libv8 (> 7.3) mini_scheduler (0.12.2) sidekiq mini_sql (0.2.5) mini_suffix (0.3.0) ffi (~> 1.9) - minitest (5.14.0) + minitest (5.14.1) mocha (1.11.2) mock_redis (0.23.0) msgpack (1.3.3) @@ -241,7 +240,7 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - onebox (1.9.27.2) + onebox (1.9.28.1) addressable (~> 2.7.0) htmlentities (~> 4.3) multi_json (~> 1.11) @@ -262,12 +261,12 @@ GEM method_source (~> 1.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.4) - puma (4.3.3) + public_suffix (4.0.5) + puma (4.3.5) nio4r (~> 2.0) r2 (0.2.7) - rack (2.0.8) - rack-mini-profiler (2.0.1) + rack (2.2.2) + rack-mini-profiler (2.0.2) rack (>= 1.2.0) rack-protection (2.0.8.1) rack @@ -278,12 +277,14 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - rails_multisite (2.1.1) + rails_failover (0.2.0) + redis (~> 4) + rails_multisite (2.1.2) activerecord (> 5.0, < 7) railties (> 5.0, < 7) - railties (6.0.2.2) - actionpack (= 6.0.2.2) - activesupport (= 6.0.2.2) + railties (6.0.3) + actionpack (= 6.0.3) + activesupport (= 6.0.3) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -295,7 +296,7 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rbtrace (0.4.12) + rbtrace (0.4.13) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) @@ -319,7 +320,7 @@ GEM rspec-mocks (~> 3.9.0) rspec-core (3.9.2) rspec-support (~> 3.9.3) - rspec-expectations (3.9.1) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-html-matchers (0.9.2) @@ -328,7 +329,7 @@ GEM rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-rails (4.0.0) + rspec-rails (4.0.1) actionpack (>= 4.2) activesupport (>= 4.2) railties (>= 4.2) @@ -342,20 +343,22 @@ GEM json-schema (~> 2.2) railties (>= 3.1, < 7.0) rtlit (0.0.5) - rubocop (0.82.0) - jaro_winkler (~> 1.5.1) + rubocop (0.84.0) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) rexml + rubocop-ast (>= 0.0.3) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.0.3) + parser (>= 2.7.0.1) rubocop-discourse (2.1.2) rubocop (>= 0.69.0) rubocop-rspec (>= 1.39.0) rubocop-rspec (1.39.0) rubocop (>= 0.68.1) - ruby-prof (1.3.2) + ruby-prof (1.4.1) ruby-progressbar (1.10.1) ruby-readability (0.7.0) guess_html_encoding (>= 0.0.4) @@ -428,14 +431,14 @@ PLATFORMS ruby DEPENDENCIES - actionmailer (= 6.0.2.2) - actionpack (= 6.0.2.2) - actionview (= 6.0.2.2) + actionmailer (= 6.0.3) + actionpack (= 6.0.3) + actionview (= 6.0.3) actionview_precompiler active_model_serializers (~> 0.8.3) - activemodel (= 6.0.2.2) - activerecord (= 6.0.2.2) - activesupport (= 6.0.2.2) + activemodel (= 6.0.3) + activerecord (= 6.0.3) + activesupport (= 6.0.3) addressable annotate aws-sdk-s3 @@ -508,11 +511,12 @@ DEPENDENCIES pry-rails puma r2 - rack (= 2.0.8) + rack (= 2.2.2) rack-mini-profiler rack-protection + rails_failover rails_multisite - railties (= 6.0.2.2) + railties (= 6.0.3) rake rb-fsevent rb-inotify (~> 0.9) @@ -528,9 +532,7 @@ DEPENDENCIES rspec-rails rswag-specs rtlit - rubocop rubocop-discourse - rubocop-rspec ruby-prof ruby-readability rubyzip diff --git a/app/assets/javascripts/admin/components/admin-backups-logs.js b/app/assets/javascripts/admin/components/admin-backups-logs.js index 1837409c58..76c8cff1ac 100644 --- a/app/assets/javascripts/admin/components/admin-backups-logs.js +++ b/app/assets/javascripts/admin/components/admin-backups-logs.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { scheduleOnce } from "@ember/runloop"; import Component from "@ember/component"; import discourseDebounce from "discourse/lib/debounce"; diff --git a/app/assets/javascripts/admin/components/admin-directory-toggle.js b/app/assets/javascripts/admin/components/admin-directory-toggle.js deleted file mode 100644 index 093f29826b..0000000000 --- a/app/assets/javascripts/admin/components/admin-directory-toggle.js +++ /dev/null @@ -1,30 +0,0 @@ -import Component from "@ember/component"; -import { iconHTML } from "discourse-common/lib/icon-library"; - -export default Component.extend({ - tagName: "th", - classNames: ["sortable"], - chevronIcon: null, - toggleProperties() { - if (this.order === this.field) { - this.set("ascending", this.ascending ? null : true); - } else { - this.setProperties({ order: this.field, ascending: null }); - } - }, - toggleChevron() { - if (this.order === this.field) { - let chevron = iconHTML(this.ascending ? "chevron-up" : "chevron-down"); - this.set("chevronIcon", `${chevron}`.htmlSafe()); - } else { - this.set("chevronIcon", null); - } - }, - click() { - this.toggleProperties(); - }, - didReceiveAttrs() { - this._super(...arguments); - this.toggleChevron(); - } -}); diff --git a/app/assets/javascripts/admin/components/admin-report-storage-stats.js b/app/assets/javascripts/admin/components/admin-report-storage-stats.js index 61629c626e..0be7256690 100644 --- a/app/assets/javascripts/admin/components/admin-report-storage-stats.js +++ b/app/assets/javascripts/admin/components/admin-report-storage-stats.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { alias } from "@ember/object/computed"; import Component from "@ember/component"; diff --git a/app/assets/javascripts/admin/components/admin-report.js b/app/assets/javascripts/admin/components/admin-report.js index 757a90a7db..b9ce9a6fdf 100644 --- a/app/assets/javascripts/admin/components/admin-report.js +++ b/app/assets/javascripts/admin/components/admin-report.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { makeArray } from "discourse-common/lib/helpers"; import { alias, or, and, equal, notEmpty, not } from "@ember/object/computed"; @@ -59,8 +60,6 @@ export default Component.extend({ forcedModes: null, showAllReportsLink: false, filters: null, - startDate: null, - endDate: null, showTrend: false, showHeader: true, showTitle: true, diff --git a/app/assets/javascripts/admin/components/admin-user-field-item.js b/app/assets/javascripts/admin/components/admin-user-field-item.js index a02404de98..d59abe4437 100644 --- a/app/assets/javascripts/admin/components/admin-user-field-item.js +++ b/app/assets/javascripts/admin/components/admin-user-field-item.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { isEmpty } from "@ember/utils"; import { empty } from "@ember/object/computed"; import { scheduleOnce } from "@ember/runloop"; diff --git a/app/assets/javascripts/admin/components/admin-watched-word.js b/app/assets/javascripts/admin/components/admin-watched-word.js index d4f5108c0f..28a1771246 100644 --- a/app/assets/javascripts/admin/components/admin-watched-word.js +++ b/app/assets/javascripts/admin/components/admin-watched-word.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Component from "@ember/component"; import { iconHTML } from "discourse-common/lib/icon-library"; diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js b/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js index a38695c735..7e76d8f6bd 100644 --- a/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js +++ b/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { alias } from "@ember/object/computed"; import Component from "@ember/component"; diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event.js b/app/assets/javascripts/admin/components/admin-web-hook-event.js index 365e22aa67..11bb2b4024 100644 --- a/app/assets/javascripts/admin/components/admin-web-hook-event.js +++ b/app/assets/javascripts/admin/components/admin-web-hook-event.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import Component from "@ember/component"; import { ajax } from "discourse/lib/ajax"; diff --git a/app/assets/javascripts/admin/components/admin-web-hook-status.js b/app/assets/javascripts/admin/components/admin-web-hook-status.js index 0c24edc9d6..6c1591bc4c 100644 --- a/app/assets/javascripts/admin/components/admin-web-hook-status.js +++ b/app/assets/javascripts/admin/components/admin-web-hook-status.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import Component from "@ember/component"; import { iconHTML } from "discourse-common/lib/icon-library"; diff --git a/app/assets/javascripts/admin/components/email-styles-editor.js b/app/assets/javascripts/admin/components/email-styles-editor.js index ef5cdb077e..93d4df6b7d 100644 --- a/app/assets/javascripts/admin/components/email-styles-editor.js +++ b/app/assets/javascripts/admin/components/email-styles-editor.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { reads } from "@ember/object/computed"; import Component from "@ember/component"; diff --git a/app/assets/javascripts/admin/components/embeddable-host.js b/app/assets/javascripts/admin/components/embeddable-host.js index 1d853b8986..cc96741fed 100644 --- a/app/assets/javascripts/admin/components/embeddable-host.js +++ b/app/assets/javascripts/admin/components/embeddable-host.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { isEmpty } from "@ember/utils"; import { or } from "@ember/object/computed"; diff --git a/app/assets/javascripts/admin/components/inline-edit-checkbox.js b/app/assets/javascripts/admin/components/inline-edit-checkbox.js index 2eb2c3ee5a..2d681202b9 100644 --- a/app/assets/javascripts/admin/components/inline-edit-checkbox.js +++ b/app/assets/javascripts/admin/components/inline-edit-checkbox.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Component from "@ember/component"; import discourseComputed, { observes } from "discourse-common/utils/decorators"; diff --git a/app/assets/javascripts/admin/components/ip-lookup.js b/app/assets/javascripts/admin/components/ip-lookup.js index b27191d617..d004555513 100644 --- a/app/assets/javascripts/admin/components/ip-lookup.js +++ b/app/assets/javascripts/admin/components/ip-lookup.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import EmberObject from "@ember/object"; import { later } from "@ember/runloop"; import Component from "@ember/component"; diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js b/app/assets/javascripts/admin/components/penalty-post-action.js index 916546452c..aeea3406c8 100644 --- a/app/assets/javascripts/admin/components/penalty-post-action.js +++ b/app/assets/javascripts/admin/components/penalty-post-action.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { equal } from "@ember/object/computed"; import Component from "@ember/component"; diff --git a/app/assets/javascripts/admin/components/permalink-form.js b/app/assets/javascripts/admin/components/permalink-form.js index e1b62a11df..81e9346d6f 100644 --- a/app/assets/javascripts/admin/components/permalink-form.js +++ b/app/assets/javascripts/admin/components/permalink-form.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { schedule } from "@ember/runloop"; import Component from "@ember/component"; import discourseComputed from "discourse-common/utils/decorators"; @@ -16,6 +17,7 @@ export default Component.extend({ { id: "topic_id", name: I18n.t("admin.permalink.topic_id") }, { id: "post_id", name: I18n.t("admin.permalink.post_id") }, { id: "category_id", name: I18n.t("admin.permalink.category_id") }, + { id: "tag_name", name: I18n.t("admin.permalink.tag_name") }, { id: "external_url", name: I18n.t("admin.permalink.external_url") } ]; }, diff --git a/app/assets/javascripts/admin/components/resumable-upload.js b/app/assets/javascripts/admin/components/resumable-upload.js index 7425f174fe..ed95ea68be 100644 --- a/app/assets/javascripts/admin/components/resumable-upload.js +++ b/app/assets/javascripts/admin/components/resumable-upload.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { later, schedule } from "@ember/runloop"; import Component from "@ember/component"; import { iconHTML } from "discourse-common/lib/icon-library"; diff --git a/app/assets/javascripts/admin/components/screened-ip-address-form.js b/app/assets/javascripts/admin/components/screened-ip-address-form.js index 48b92641b4..1046f4c210 100644 --- a/app/assets/javascripts/admin/components/screened-ip-address-form.js +++ b/app/assets/javascripts/admin/components/screened-ip-address-form.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { schedule } from "@ember/runloop"; import Component from "@ember/component"; diff --git a/app/assets/javascripts/admin/components/secret-value-list.js b/app/assets/javascripts/admin/components/secret-value-list.js index ea4ecf792c..399ec5c6e7 100644 --- a/app/assets/javascripts/admin/components/secret-value-list.js +++ b/app/assets/javascripts/admin/components/secret-value-list.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { isEmpty } from "@ember/utils"; import Component from "@ember/component"; import { on } from "discourse-common/utils/decorators"; diff --git a/app/assets/javascripts/admin/components/tags-uploader.js b/app/assets/javascripts/admin/components/tags-uploader.js index 88f4afc8d9..7530f29e21 100644 --- a/app/assets/javascripts/admin/components/tags-uploader.js +++ b/app/assets/javascripts/admin/components/tags-uploader.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { alias } from "@ember/object/computed"; import Component from "@ember/component"; import UploadMixin from "discourse/mixins/upload"; diff --git a/app/assets/javascripts/admin/components/watched-word-form.js b/app/assets/javascripts/admin/components/watched-word-form.js index fff5b86e26..96ddbffd7c 100644 --- a/app/assets/javascripts/admin/components/watched-word-form.js +++ b/app/assets/javascripts/admin/components/watched-word-form.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { isEmpty } from "@ember/utils"; import { schedule } from "@ember/runloop"; import Component from "@ember/component"; diff --git a/app/assets/javascripts/admin/components/watched-word-uploader.js b/app/assets/javascripts/admin/components/watched-word-uploader.js index 05dc41c207..dceecea228 100644 --- a/app/assets/javascripts/admin/components/watched-word-uploader.js +++ b/app/assets/javascripts/admin/components/watched-word-uploader.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { alias } from "@ember/object/computed"; import Component from "@ember/component"; diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-new.js b/app/assets/javascripts/admin/controllers/admin-api-keys-new.js index 9384e79557..eaddcfcd82 100644 --- a/app/assets/javascripts/admin/controllers/admin-api-keys-new.js +++ b/app/assets/javascripts/admin/controllers/admin-api-keys-new.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { isBlank } from "@ember/utils"; import Controller from "@ember/controller"; import discourseComputed from "discourse-common/utils/decorators"; diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js b/app/assets/javascripts/admin/controllers/admin-backups-index.js index 45f25dd617..c3b43450b1 100644 --- a/app/assets/javascripts/admin/controllers/admin-backups-index.js +++ b/app/assets/javascripts/admin/controllers/admin-backups-index.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { alias, equal } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; import { ajax } from "discourse/lib/ajax"; diff --git a/app/assets/javascripts/admin/controllers/admin-badges-award.js b/app/assets/javascripts/admin/controllers/admin-badges-award.js index ef141ccac1..d7945b15c7 100644 --- a/app/assets/javascripts/admin/controllers/admin-badges-award.js +++ b/app/assets/javascripts/admin/controllers/admin-badges-award.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Controller from "@ember/controller"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js b/app/assets/javascripts/admin/controllers/admin-badges-show.js index a860d2f992..6a44fe4ae4 100644 --- a/app/assets/javascripts/admin/controllers/admin-badges-show.js +++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed, { observes } from "discourse-common/utils/decorators"; import { reads } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js index a27022390f..61f6e5d6e7 100644 --- a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js +++ b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { later } from "@ember/runloop"; import Controller from "@ember/controller"; diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js b/app/assets/javascripts/admin/controllers/admin-customize-colors.js index e2ff119aa4..062121fc47 100644 --- a/app/assets/javascripts/admin/controllers/admin-customize-colors.js +++ b/app/assets/javascripts/admin/controllers/admin-customize-colors.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import EmberObject from "@ember/object"; import Controller from "@ember/controller"; import showModal from "discourse/lib/show-modal"; diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js index d534792b00..0daf5c7973 100644 --- a/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js +++ b/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import Controller from "@ember/controller"; diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js b/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js index 3617edca75..f6e19c6368 100644 --- a/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js +++ b/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import Controller from "@ember/controller"; import { popupAjaxError } from "discourse/lib/ajax-error"; diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js index c3c0f4fc99..a606505692 100644 --- a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js +++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Controller from "@ember/controller"; import { url } from "discourse/lib/computed"; import discourseComputed from "discourse-common/utils/decorators"; diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js index 5440c4260a..2c5ad32a18 100644 --- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js +++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { makeArray } from "discourse-common/lib/helpers"; import { empty, diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js index 5f2ea86819..07a195b566 100644 --- a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js +++ b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { makeArray } from "discourse-common/lib/helpers"; import { inject } from "@ember/controller"; diff --git a/app/assets/javascripts/admin/controllers/admin-email-index.js b/app/assets/javascripts/admin/controllers/admin-email-index.js index 3433f6f55f..8fad5ff034 100644 --- a/app/assets/javascripts/admin/controllers/admin-email-index.js +++ b/app/assets/javascripts/admin/controllers/admin-email-index.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { empty } from "@ember/object/computed"; import Controller from "@ember/controller"; import { ajax } from "discourse/lib/ajax"; diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js b/app/assets/javascripts/admin/controllers/admin-emojis.js index 1a49670703..96b9e1ff8e 100644 --- a/app/assets/javascripts/admin/controllers/admin-emojis.js +++ b/app/assets/javascripts/admin/controllers/admin-emojis.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { sort } from "@ember/object/computed"; import EmberObject, { action, computed } from "@ember/object"; import Controller from "@ember/controller"; diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js index 789f070db1..73a780e278 100644 --- a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js +++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Controller from "@ember/controller"; import discourseDebounce from "discourse/lib/debounce"; import { outputExportResult } from "discourse/lib/export-result"; diff --git a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js index 7ef84b45ad..059267ca40 100644 --- a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js +++ b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { gt } from "@ember/object/computed"; import EmberObject from "@ember/object"; import { scheduleOnce } from "@ember/runloop"; diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js b/app/assets/javascripts/admin/controllers/admin-permalinks.js index 6f0842049c..177bb4148d 100644 --- a/app/assets/javascripts/admin/controllers/admin-permalinks.js +++ b/app/assets/javascripts/admin/controllers/admin-permalinks.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Controller from "@ember/controller"; import discourseDebounce from "discourse/lib/debounce"; import Permalink from "admin/models/permalink"; diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-index.js b/app/assets/javascripts/admin/controllers/admin-search-logs-index.js index 397b4c9b9e..ab58efbfcb 100644 --- a/app/assets/javascripts/admin/controllers/admin-search-logs-index.js +++ b/app/assets/javascripts/admin/controllers/admin-search-logs-index.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Controller from "@ember/controller"; export const DEFAULT_PERIOD = "yearly"; diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js index 66def62c97..cd493e35bc 100644 --- a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js +++ b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Controller from "@ember/controller"; import { DEFAULT_PERIOD } from "admin/controllers/admin-search-logs-index"; diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js b/app/assets/javascripts/admin/controllers/admin-site-settings.js index ac84553a71..04826ca133 100644 --- a/app/assets/javascripts/admin/controllers/admin-site-settings.js +++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { isEmpty } from "@ember/utils"; import { alias } from "@ember/object/computed"; import Controller from "@ember/controller"; @@ -15,12 +16,32 @@ export default Controller.extend({ // If we have no content, don't bother filtering anything if (!!isEmpty(this.allSiteSettings)) return; - let filter; + let filter, pluginFilter; if (this.filter) { - filter = this.filter.toLowerCase().trim(); + filter = this.filter + .toLowerCase() + .split(" ") + .filter(word => { + if (word.length === 0) { + return false; + } + + if (word.startsWith("plugin:")) { + pluginFilter = word.substr("plugin:".length).trim(); + return false; + } + + return true; + }) + .join(" ") + .trim(); } - if ((!filter || 0 === filter.length) && !this.onlyOverridden) { + if ( + (!filter || 0 === filter.length) && + (!pluginFilter || 0 === pluginFilter.length) && + !this.onlyOverridden + ) { this.set("visibleSiteSettings", this.allSiteSettings); if (this.categoryNameKey === "all_results") { this.transitionToRoute("adminSiteSettings"); @@ -39,6 +60,7 @@ export default Controller.extend({ this.allSiteSettings.forEach(settingsCategory => { const siteSettings = settingsCategory.siteSettings.filter(item => { if (this.onlyOverridden && !item.get("overridden")) return false; + if (pluginFilter && item.plugin !== pluginFilter) return false; if (filter) { const setting = item.get("setting").toLowerCase(); return ( diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js index d24a172910..417c823824 100644 --- a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js +++ b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import Controller from "@ember/controller"; import { popupAjaxError } from "discourse/lib/ajax-error"; diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js b/app/assets/javascripts/admin/controllers/admin-user-badges.js index a42bf58ca5..63e7edca25 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-badges.js +++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { alias, sort } from "@ember/object/computed"; import { next } from "@ember/runloop"; diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js b/app/assets/javascripts/admin/controllers/admin-user-fields.js index b81b08f559..61e916748b 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-fields.js +++ b/app/assets/javascripts/admin/controllers/admin-user-fields.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { gte, sort } from "@ember/object/computed"; import Controller from "@ember/controller"; import { popupAjaxError } from "discourse/lib/ajax-error"; diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js b/app/assets/javascripts/admin/controllers/admin-user-index.js index 9076e56654..de6545056f 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-index.js +++ b/app/assets/javascripts/admin/controllers/admin-user-index.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { notEmpty, and } from "@ember/object/computed"; import { inject as service } from "@ember/service"; import Controller from "@ember/controller"; diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js b/app/assets/javascripts/admin/controllers/admin-users-list-show.js index 8b7adb194c..9f82545dac 100644 --- a/app/assets/javascripts/admin/controllers/admin-users-list-show.js +++ b/app/assets/javascripts/admin/controllers/admin-users-list-show.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed, { observes } from "discourse-common/utils/decorators"; import Controller from "@ember/controller"; import discourseDebounce from "discourse/lib/debounce"; @@ -10,7 +11,7 @@ export default Controller.extend(CanCheckEmails, { model: null, query: null, order: null, - ascending: null, + asc: null, showEmails: false, refreshing: false, listFilter: null, @@ -53,7 +54,7 @@ export default Controller.extend(CanCheckEmails, { filter: this.listFilter, show_emails: this.showEmails, order: this.order, - ascending: this.ascending, + asc: this.asc, page: this._page }) .then(result => { diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js index cf5815da73..1a8070569f 100644 --- a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js +++ b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { or } from "@ember/object/computed"; import { schedule } from "@ember/runloop"; diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js index 4332f52d9c..031ad8ee8b 100644 --- a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js +++ b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { isEmpty } from "@ember/utils"; import { alias } from "@ember/object/computed"; diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks.js b/app/assets/javascripts/admin/controllers/admin-web-hooks.js index f9f401e330..ec025662ef 100644 --- a/app/assets/javascripts/admin/controllers/admin-web-hooks.js +++ b/app/assets/javascripts/admin/controllers/admin-web-hooks.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Controller from "@ember/controller"; import { popupAjaxError } from "discourse/lib/ajax-error"; diff --git a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js index 6fb2859618..da260b409e 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js +++ b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { isEmpty } from "@ember/utils"; import { and, not } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; diff --git a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js index c5baa8eb9a..531d3ea665 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js +++ b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { alias, map } from "@ember/object/computed"; import Controller from "@ember/controller"; import discourseComputed from "discourse-common/utils/decorators"; diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js index f1d1274abd..1372f16ca9 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js +++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Controller from "@ember/controller"; import { A } from "@ember/array"; import { ajax } from "discourse/lib/ajax"; diff --git a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js index 16cf2034d5..7b74bc9964 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js +++ b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { equal, match, alias } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; import ModalFunctionality from "discourse/mixins/modal-functionality"; diff --git a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js index 91dbe7d072..08ac66070c 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js +++ b/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Controller, { inject as controller } from "@ember/controller"; import ModalFunctionality from "discourse/mixins/modal-functionality"; import discourseComputed from "discourse-common/utils/decorators"; diff --git a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js b/app/assets/javascripts/admin/controllers/modals/admin-reseed.js index 326a3a66a7..44bf29a207 100644 --- a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js +++ b/app/assets/javascripts/admin/controllers/modals/admin-reseed.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Controller from "@ember/controller"; import ModalFunctionality from "discourse/mixins/modal-functionality"; import { ajax } from "discourse/lib/ajax"; diff --git a/app/assets/javascripts/admin/helpers/human-size.js b/app/assets/javascripts/admin/helpers/human-size.js index cb022e64e1..fe543937f1 100644 --- a/app/assets/javascripts/admin/helpers/human-size.js +++ b/app/assets/javascripts/admin/helpers/human-size.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { htmlHelper } from "discourse-common/lib/helpers"; export default htmlHelper(size => I18n.toHumanSize(size)); diff --git a/app/assets/javascripts/admin/helpers/post-action-title.js b/app/assets/javascripts/admin/helpers/post-action-title.js index 657aee2e9b..53b5922ae5 100644 --- a/app/assets/javascripts/admin/helpers/post-action-title.js +++ b/app/assets/javascripts/admin/helpers/post-action-title.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Helper from "@ember/component/helper"; function postActionTitle([id, nameKey]) { diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js b/app/assets/javascripts/admin/mixins/penalty-controller.js index 46ba124e18..73349e1067 100644 --- a/app/assets/javascripts/admin/mixins/penalty-controller.js +++ b/app/assets/javascripts/admin/mixins/penalty-controller.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import ModalFunctionality from "discourse/mixins/modal-functionality"; import { popupAjaxError } from "discourse/lib/ajax-error"; import Mixin from "@ember/object/mixin"; diff --git a/app/assets/javascripts/admin/mixins/setting-component.js b/app/assets/javascripts/admin/mixins/setting-component.js index e7afc119f2..83dcc31e65 100644 --- a/app/assets/javascripts/admin/mixins/setting-component.js +++ b/app/assets/javascripts/admin/mixins/setting-component.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { warn } from "@ember/debug"; import discourseComputed from "discourse-common/utils/decorators"; import { alias, oneWay } from "@ember/object/computed"; diff --git a/app/assets/javascripts/admin/mixins/setting-object.js b/app/assets/javascripts/admin/mixins/setting-object.js index 0d97e79873..bfacbedc8e 100644 --- a/app/assets/javascripts/admin/mixins/setting-object.js +++ b/app/assets/javascripts/admin/mixins/setting-object.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { computed } from "@ember/object"; import Mixin from "@ember/object/mixin"; diff --git a/app/assets/javascripts/admin/models/admin-user.js b/app/assets/javascripts/admin/models/admin-user.js index 1ddb7a52ff..9977fa8dd4 100644 --- a/app/assets/javascripts/admin/models/admin-user.js +++ b/app/assets/javascripts/admin/models/admin-user.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { filter, or, gt, lt, not } from "@ember/object/computed"; import { iconHTML } from "discourse-common/lib/icon-library"; @@ -76,12 +77,6 @@ const AdminUser = User.extend({ }); }, - revokeApiKey() { - return ajax(`/admin/users/${this.id}/revoke_api_key`, { - type: "DELETE" - }).then(() => this.set("api_key", null)); - }, - deleteAllPosts() { let deletedPosts = 0; const user = this; diff --git a/app/assets/javascripts/admin/models/backup.js b/app/assets/javascripts/admin/models/backup.js index 882173300a..2c41e1ef9d 100644 --- a/app/assets/javascripts/admin/models/backup.js +++ b/app/assets/javascripts/admin/models/backup.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; import { extractError } from "discourse/lib/ajax-error"; import EmberObject from "@ember/object"; diff --git a/app/assets/javascripts/admin/models/color-scheme-color.js b/app/assets/javascripts/admin/models/color-scheme-color.js index f1aa235a4b..e55fa258f8 100644 --- a/app/assets/javascripts/admin/models/color-scheme-color.js +++ b/app/assets/javascripts/admin/models/color-scheme-color.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed, { observes, on diff --git a/app/assets/javascripts/admin/models/color-scheme.js b/app/assets/javascripts/admin/models/color-scheme.js index ee60097b74..5fe6337f0d 100644 --- a/app/assets/javascripts/admin/models/color-scheme.js +++ b/app/assets/javascripts/admin/models/color-scheme.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { A } from "@ember/array"; import ArrayProxy from "@ember/array/proxy"; import discourseComputed from "discourse-common/utils/decorators"; diff --git a/app/assets/javascripts/admin/models/flag-type.js b/app/assets/javascripts/admin/models/flag-type.js index 93fb2eacc9..1079110045 100644 --- a/app/assets/javascripts/admin/models/flag-type.js +++ b/app/assets/javascripts/admin/models/flag-type.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import RestModel from "discourse/models/rest"; diff --git a/app/assets/javascripts/admin/models/report.js b/app/assets/javascripts/admin/models/report.js index d0152c1a9e..2e0b448887 100644 --- a/app/assets/javascripts/admin/models/report.js +++ b/app/assets/javascripts/admin/models/report.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { makeArray } from "discourse-common/lib/helpers"; import { isEmpty } from "@ember/utils"; @@ -346,7 +347,7 @@ const Report = EmberObject.extend({ return { value: username, - formatedValue: username ? formatedValue(username) : "—" + formatedValue: username ? formatedValue() : "—" }; }, diff --git a/app/assets/javascripts/admin/models/screened-email.js b/app/assets/javascripts/admin/models/screened-email.js index 4ef3217edf..df2fa40ff9 100644 --- a/app/assets/javascripts/admin/models/screened-email.js +++ b/app/assets/javascripts/admin/models/screened-email.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { ajax } from "discourse/lib/ajax"; import EmberObject from "@ember/object"; diff --git a/app/assets/javascripts/admin/models/screened-ip-address.js b/app/assets/javascripts/admin/models/screened-ip-address.js index bfac17d86c..585acb9b79 100644 --- a/app/assets/javascripts/admin/models/screened-ip-address.js +++ b/app/assets/javascripts/admin/models/screened-ip-address.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { equal } from "@ember/object/computed"; import { ajax } from "discourse/lib/ajax"; diff --git a/app/assets/javascripts/admin/models/screened-url.js b/app/assets/javascripts/admin/models/screened-url.js index 31ea850778..4cde3d1261 100644 --- a/app/assets/javascripts/admin/models/screened-url.js +++ b/app/assets/javascripts/admin/models/screened-url.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { ajax } from "discourse/lib/ajax"; import EmberObject from "@ember/object"; diff --git a/app/assets/javascripts/admin/models/site-setting.js b/app/assets/javascripts/admin/models/site-setting.js index 4edc89a1b9..01e34566f5 100644 --- a/app/assets/javascripts/admin/models/site-setting.js +++ b/app/assets/javascripts/admin/models/site-setting.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; import Setting from "admin/mixins/setting-object"; import EmberObject from "@ember/object"; diff --git a/app/assets/javascripts/admin/models/staff-action-log.js b/app/assets/javascripts/admin/models/staff-action-log.js index 45330b13fc..a077d054c0 100644 --- a/app/assets/javascripts/admin/models/staff-action-log.js +++ b/app/assets/javascripts/admin/models/staff-action-log.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; import { ajax } from "discourse/lib/ajax"; import AdminUser from "admin/models/admin-user"; diff --git a/app/assets/javascripts/admin/models/theme.js b/app/assets/javascripts/admin/models/theme.js index e63e9e1cce..0b96660f99 100644 --- a/app/assets/javascripts/admin/models/theme.js +++ b/app/assets/javascripts/admin/models/theme.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { get } from "@ember/object"; import { isBlank, isEmpty } from "@ember/utils"; import { or, gt } from "@ember/object/computed"; diff --git a/app/assets/javascripts/admin/models/tl3-requirements.js b/app/assets/javascripts/admin/models/tl3-requirements.js index 424aea4f58..6331333de7 100644 --- a/app/assets/javascripts/admin/models/tl3-requirements.js +++ b/app/assets/javascripts/admin/models/tl3-requirements.js @@ -12,6 +12,11 @@ export default EmberObject.extend({ return Math.round((minDaysVisited * 100) / timePeriod); }, + @discourseComputed("num_topics_replied_to", "min_topics_replied_to") + capped_topics_replied_to(numReplied, minReplied) { + return numReplied > minReplied; + }, + @discourseComputed( "days_visited", "min_days_visited", diff --git a/app/assets/javascripts/admin/models/watched-word.js b/app/assets/javascripts/admin/models/watched-word.js index dac78affe1..6713a8a605 100644 --- a/app/assets/javascripts/admin/models/watched-word.js +++ b/app/assets/javascripts/admin/models/watched-word.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; import EmberObject from "@ember/object"; diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js b/app/assets/javascripts/admin/routes/admin-backups-logs.js index 3d24756a4a..2c7e16eed7 100644 --- a/app/assets/javascripts/admin/routes/admin-backups-logs.js +++ b/app/assets/javascripts/admin/routes/admin-backups-logs.js @@ -1,6 +1,6 @@ import EmberObject from "@ember/object"; import Route from "@ember/routing/route"; -import PreloadStore from "preload-store"; +import PreloadStore from "discourse/lib/preload-store"; export default Route.extend({ // since the logs are pushed via the message bus diff --git a/app/assets/javascripts/admin/routes/admin-backups.js b/app/assets/javascripts/admin/routes/admin-backups.js index 6bc42d725f..3d517acbf1 100644 --- a/app/assets/javascripts/admin/routes/admin-backups.js +++ b/app/assets/javascripts/admin/routes/admin-backups.js @@ -1,10 +1,11 @@ +import I18n from "I18n"; import EmberObject from "@ember/object"; import DiscourseRoute from "discourse/routes/discourse"; import { ajax } from "discourse/lib/ajax"; import showModal from "discourse/lib/show-modal"; import BackupStatus from "admin/models/backup-status"; import Backup from "admin/models/backup"; -import PreloadStore from "preload-store"; +import PreloadStore from "discourse/lib/preload-store"; import User from "discourse/models/user"; const LOG_CHANNEL = "/admin/backups/logs"; diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js b/app/assets/javascripts/admin/routes/admin-badges-show.js index 4a29cfae0a..7a74db7161 100644 --- a/app/assets/javascripts/admin/routes/admin-badges-show.js +++ b/app/assets/javascripts/admin/routes/admin-badges-show.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { get } from "@ember/object"; import Route from "@ember/routing/route"; import { ajax } from "discourse/lib/ajax"; diff --git a/app/assets/javascripts/admin/routes/admin-badges.js b/app/assets/javascripts/admin/routes/admin-badges.js index 0dac4bbaa2..ab6de98504 100644 --- a/app/assets/javascripts/admin/routes/admin-badges.js +++ b/app/assets/javascripts/admin/routes/admin-badges.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import DiscourseRoute from "discourse/routes/discourse"; import { ajax } from "discourse/lib/ajax"; import Badge from "discourse/models/badge"; diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js index 8dcc18f0d9..d3a2b035af 100644 --- a/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js +++ b/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Route from "@ember/routing/route"; export default Route.extend({ model(params) { diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js index 62a70f0d7c..5cb695ddcd 100644 --- a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js +++ b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Route from "@ember/routing/route"; export default Route.extend({ model(params) { diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-show.js b/app/assets/javascripts/admin/routes/admin-customize-themes-show.js index 5b9ce25169..ee175a9df8 100644 --- a/app/assets/javascripts/admin/routes/admin-customize-themes-show.js +++ b/app/assets/javascripts/admin/routes/admin-customize-themes-show.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import Route from "@ember/routing/route"; import { scrollTop } from "discourse/mixins/scroll-top"; import { THEMES, COMPONENTS } from "admin/models/theme"; diff --git a/app/assets/javascripts/admin/routes/admin-plugins.js b/app/assets/javascripts/admin/routes/admin-plugins.js index c4af286faf..261610a97e 100644 --- a/app/assets/javascripts/admin/routes/admin-plugins.js +++ b/app/assets/javascripts/admin/routes/admin-plugins.js @@ -9,18 +9,12 @@ export default Route.extend({ const controller = this.controllerFor("adminSiteSettings"); this.transitionTo("adminSiteSettingsCategory", "plugins").then(() => { if (plugin) { - const siteSettingFilter = plugin.get("enabled_setting_filter"); - const match = /^(.*)_enabled/.exec(plugin.get("enabled_setting")); - const filter = siteSettingFilter || match[1]; - - if (filter) { - // filterContent() is normally on a debounce from typing. - // Because we don't want the default of "All Results", we tell it - // to skip the next debounce. - controller.set("filter", filter); - controller.set("_skipBounce", true); - controller.filterContentNow("plugins"); - } + // filterContent() is normally on a debounce from typing. + // Because we don't want the default of "All Results", we tell it + // to skip the next debounce. + controller.set("filter", `plugin:${plugin.id}`); + controller.set("_skipBounce", true); + controller.filterContentNow("plugins"); } }); } diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-category.js b/app/assets/javascripts/admin/routes/admin-site-settings-category.js index b5a2f810b2..e8a9b853d4 100644 --- a/app/assets/javascripts/admin/routes/admin-site-settings-category.js +++ b/app/assets/javascripts/admin/routes/admin-site-settings-category.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import EmberObject from "@ember/object"; import DiscourseRoute from "discourse/routes/discourse"; diff --git a/app/assets/javascripts/admin/routes/admin-users-list-show.js b/app/assets/javascripts/admin/routes/admin-users-list-show.js index 764fe4ad34..c16591d37f 100644 --- a/app/assets/javascripts/admin/routes/admin-users-list-show.js +++ b/app/assets/javascripts/admin/routes/admin-users-list-show.js @@ -3,7 +3,7 @@ import DiscourseRoute from "discourse/routes/discourse"; export default DiscourseRoute.extend({ queryParams: { order: { refreshModel: true }, - ascending: { refreshModel: true } + asc: { refreshModel: true } }, // TODO: this has been introduced to fix a bug in admin-users-list-show @@ -18,7 +18,7 @@ export default DiscourseRoute.extend({ if (controller) { controller.setProperties({ order: transition.to.queryParams.order, - ascending: transition.to.queryParams.ascending, + asc: transition.to.queryParams.asc, query: params.filter, refreshing: false }); diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-action.js b/app/assets/javascripts/admin/routes/admin-watched-words-action.js index 358cfebe67..af416c48de 100644 --- a/app/assets/javascripts/admin/routes/admin-watched-words-action.js +++ b/app/assets/javascripts/admin/routes/admin-watched-words-action.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import EmberObject from "@ember/object"; import DiscourseRoute from "discourse/routes/discourse"; diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js index 34aed775cc..f0860e79f7 100644 --- a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js +++ b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js @@ -1,5 +1,4 @@ import { get } from "@ember/object"; -import { isEmpty } from "@ember/utils"; import DiscourseRoute from "discourse/routes/discourse"; export default DiscourseRoute.extend({ @@ -15,7 +14,7 @@ export default DiscourseRoute.extend({ }, setupController(controller, model) { - if (model.get("isNew") || isEmpty(model.get("web_hook_event_types"))) { + if (model.get("isNew")) { model.set("web_hook_event_types", controller.get("defaultEventTypes")); } diff --git a/app/assets/javascripts/admin/routes/admin.js b/app/assets/javascripts/admin/routes/admin.js index bc4e8173ef..0a7ae99fdd 100644 --- a/app/assets/javascripts/admin/routes/admin.js +++ b/app/assets/javascripts/admin/routes/admin.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import DiscourseRoute from "discourse/routes/discourse"; export default DiscourseRoute.extend({ diff --git a/app/assets/javascripts/admin/services/admin-tools.js b/app/assets/javascripts/admin/services/admin-tools.js index bb5e1ac06a..6193beed66 100644 --- a/app/assets/javascripts/admin/services/admin-tools.js +++ b/app/assets/javascripts/admin/services/admin-tools.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; // A service that can act as a bridge between the front end Discourse application // and the admin application. Use this if you need front end code to access admin // modules. Inject it optionally, and if it exists go to town! diff --git a/app/assets/javascripts/admin/templates/components/admin-directory-toggle.hbs b/app/assets/javascripts/admin/templates/components/admin-directory-toggle.hbs deleted file mode 100644 index 7ea697404f..0000000000 --- a/app/assets/javascripts/admin/templates/components/admin-directory-toggle.hbs +++ /dev/null @@ -1 +0,0 @@ -{{i18n this.i18nKey}}{{chevronIcon}} diff --git a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs index 11384580c1..848c68145c 100644 --- a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs +++ b/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs @@ -1,5 +1,6 @@ + +{{setting-validation-message message=validationMessage}} diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs index 604befe690..053ce042a8 100644 --- a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs +++ b/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs @@ -9,7 +9,7 @@ {{#if popular}}
{{#each themes as |theme|}} -
+
{{#if theme.component}} diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs index dcfca2a918..1424e530b9 100644 --- a/app/assets/javascripts/admin/templates/permalinks.hbs +++ b/app/assets/javascripts/admin/templates/permalinks.hbs @@ -32,6 +32,9 @@ {{#if pl.category_id}} {{category-link pl.category}} {{/if}} + {{#if pl.tag_id}} + {{pl.tag_name}} + {{/if}} {{#if pl.external_url}} {{#if pl.linkIsExternal}} {{d-icon "external-link-alt"}} diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs index b89b6e6f01..072f7d2141 100644 --- a/app/assets/javascripts/admin/templates/plugins-index.hbs +++ b/app/assets/javascripts/admin/templates/plugins-index.hbs @@ -47,7 +47,7 @@ {{#if currentUser.admin}} - {{#if plugin.enabled_setting}} + {{#if plugin.has_settings}} {{d-button class="btn-default" action=(route-action "showSettings") actionParam=plugin icon="cog" label="admin.plugins.change_settings_short"}} {{/if}} {{/if}} diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs index 6a76b438a1..de71c0bfb9 100644 --- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs +++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs @@ -33,7 +33,7 @@ {{i18n "admin.user.tl3_requirements.topics_replied_to"}} {{check-icon model.tl3Requirements.met.topics_replied_to}} - {{model.tl3Requirements.num_topics_replied_to}} + {{#if model.tl3Requirements.capped_topics_replied_to}}≥ {{/if}}{{model.tl3Requirements.num_topics_replied_to}} {{model.tl3Requirements.min_topics_replied_to}} diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs index e96f794a67..ff66a923a2 100644 --- a/app/assets/javascripts/admin/templates/users-list-show.hbs +++ b/app/assets/javascripts/admin/templates/users-list-show.hbs @@ -23,14 +23,14 @@ {{#if model}} - {{admin-directory-toggle field="username" i18nKey="username" order=order ascending=ascending}} - {{admin-directory-toggle field="email" i18nKey="email" order=order ascending=ascending}} - {{admin-directory-toggle field="last_emailed" i18nKey="admin.users.last_emailed" order=order ascending=ascending}} - {{admin-directory-toggle field="seen" i18nKey="last_seen" order=order ascending=ascending}} - {{admin-directory-toggle field="topics_viewed" i18nKey="admin.user.topics_entered" order=order ascending=ascending}} - {{admin-directory-toggle field="posts_read" i18nKey="admin.user.posts_read_count" order=order ascending=ascending}} - {{admin-directory-toggle field="read_time" i18nKey="admin.user.time_read" order=order ascending=ascending}} - {{admin-directory-toggle field="created" i18nKey="created" order=order ascending=ascending}} + {{table-header-toggle field="username" labelKey="username" order=order asc=asc}} + {{table-header-toggle field="email" labelKey="email" order=order asc=asc}} + {{table-header-toggle field="last_emailed" labelKey="admin.users.last_emailed" order=order asc=asc}} + {{table-header-toggle field="seen" labelKey="last_seen" order=order asc=asc}} + {{table-header-toggle field="topics_viewed" labelKey="admin.user.topics_entered" order=order asc=asc}} + {{table-header-toggle field="posts_read" labelKey="admin.user.posts_read_count" order=order asc=asc}} + {{table-header-toggle field="read_time" labelKey="admin.user.time_read" order=order asc=asc}} + {{table-header-toggle field="created" labelKey="created" order=order asc=asc}} {{#if siteSettings.must_approve_users}} {{/if}} diff --git a/app/assets/javascripts/app-boot.js b/app/assets/javascripts/app-boot.js index d744e7f649..ef4702622a 100644 --- a/app/assets/javascripts/app-boot.js +++ b/app/assets/javascripts/app-boot.js @@ -4,7 +4,12 @@ if (window.unsupportedBrowser) { throw "Unsupported browser detected"; } - let Discourse = requirejs("discourse/app").default; + let Discourse = requirejs("discourse/app").default.create(); + + // required for our template compiler + window.__DISCOURSE_RAW_TEMPLATES = requirejs( + "discourse-common/lib/raw-templates" + ).__DISCOURSE_RAW_TEMPLATES; // ensure Discourse is added as a global window.Discourse = Discourse; diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d7f9c0d96b..40f1d275bb 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,6 +1,6 @@ //= require_tree ./discourse-common/addon //= require ./polyfills -//= require_tree ./select-kit +//= require_tree ./select-kit/addon //= require ./discourse/app/app //= require ./app-boot diff --git a/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js b/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js index 0d58d0f5c3..2eb7a75f65 100644 --- a/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js +++ b/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { htmlHelper } from "discourse-common/lib/helpers"; export default htmlHelper((key, params) => I18n.t(key, params.hash)); diff --git a/app/assets/javascripts/discourse-common/addon/helpers/i18n.js b/app/assets/javascripts/discourse-common/addon/helpers/i18n.js index 902ed699bf..f9fc65aa8d 100644 --- a/app/assets/javascripts/discourse-common/addon/helpers/i18n.js +++ b/app/assets/javascripts/discourse-common/addon/helpers/i18n.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { registerUnbound } from "discourse-common/lib/helpers"; registerUnbound("i18n", (key, params) => I18n.t(key, params)); diff --git a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js index 047cbd854c..decc668180 100644 --- a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js +++ b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js @@ -1,3 +1,4 @@ +import I18n from "I18n"; import { h } from "virtual-dom"; import attributeHook from "discourse-common/lib/attribute-hook"; import deprecated from "discourse-common/lib/deprecated"; diff --git a/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js b/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js new file mode 100644 index 0000000000..2aa14dbf0d --- /dev/null +++ b/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js @@ -0,0 +1,38 @@ +import { getResolverOption } from "discourse-common/resolver"; + +export const __DISCOURSE_RAW_TEMPLATES = {}; + +export function addRawTemplate(name, template) { + __DISCOURSE_RAW_TEMPLATES[name] = template; +} + +export function removeRawTemplate(name) { + delete __DISCOURSE_RAW_TEMPLATES[name]; +} + +export function findRawTemplate(name) { + if (getResolverOption("mobileView")) { + return ( + __DISCOURSE_RAW_TEMPLATES[`javascripts/mobile/${name}`] || + __DISCOURSE_RAW_TEMPLATES[`javascripts/${name}`] || + __DISCOURSE_RAW_TEMPLATES[`mobile/${name}`] || + __DISCOURSE_RAW_TEMPLATES[name] + ); + } + + return ( + __DISCOURSE_RAW_TEMPLATES[`javascripts/${name}`] || + __DISCOURSE_RAW_TEMPLATES[name] + ); +} + +export function buildRawConnectorCache(findOutlets) { + let result = {}; + findOutlets(__DISCOURSE_RAW_TEMPLATES, (outletName, resource) => { + result[outletName] = result[outletName] || []; + result[outletName].push({ + template: __DISCOURSE_RAW_TEMPLATES[resource] + }); + }); + return result; +} diff --git a/app/assets/javascripts/discourse-common/addon/mixins/focus-event.js b/app/assets/javascripts/discourse-common/addon/mixins/focus-event.js deleted file mode 100644 index 0688c90831..0000000000 --- a/app/assets/javascripts/discourse-common/addon/mixins/focus-event.js +++ /dev/null @@ -1,45 +0,0 @@ -import { bind } from "@ember/runloop"; -import { getOwner } from "discourse-common/lib/get-owner"; -import Mixin from "@ember/object/mixin"; - -export default Mixin.create({ - ready() { - this._super(...arguments); - - this._onChangeHandler = bind(this, this._onChange); - - // Default to true - Discourse.set("hasFocus", true); - - document.addEventListener("visibilitychange", this._onChangeHandler); - document.addEventListener("resume", this._onChangeHandler); - document.addEventListener("freeze", this._onChangeHandler); - }, - - reset() { - this._super(...arguments); - - document.removeEventListener("visibilitychange", this._onChangeHandler); - document.removeEventListener("resume", this._onChangeHandler); - document.removeEventListener("freeze", this._onChangeHandler); - - this._onChangeHandler = null; - }, - - _onChange() { - const container = getOwner(this); - const appEvents = container.lookup("service:app-events"); - - if (document.visibilityState === "hidden") { - if (Discourse.hasFocus) { - Discourse.set("hasFocus", false); - appEvents.trigger("discourse:focus-changed", false); - } - } else { - if (!Discourse.hasFocus) { - Discourse.set("hasFocus", true); - appEvents.trigger("discourse:focus-changed", true); - } - } - } -}); diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js index bafa10820a..fc829ae12f 100644 --- a/app/assets/javascripts/discourse-loader.js +++ b/app/assets/javascripts/discourse-loader.js @@ -1,12 +1,15 @@ var define, requirejs; (function() { - // In future versions of ember we don't need this var EMBER_MODULES = {}; var ALIASES = { "ember-addons/ember-computed-decorators": - "discourse-common/utils/decorators" + "discourse-common/utils/decorators", + "discourse/lib/raw-templates": "discourse-common/lib/raw-templates", + "preload-store": "discourse/lib/preload-store" }; + + // In future versions of ember we don't need this if (typeof Ember !== "undefined") { EMBER_MODULES = { jquery: { default: $ }, @@ -33,7 +36,6 @@ var define, requirejs; default: Ember.Object, get: Ember.get, getProperties: Ember.getProperties, - guidFor: Ember.guidFor, set: Ember.set, setProperties: Ember.setProperties, computed: Ember.computed, @@ -138,6 +140,10 @@ var define, requirejs; }, "@ember/object/internals": { guidFor: Ember.guidFor + }, + I18n: { + // eslint-disable-next-line + default: I18n } }; } diff --git a/app/assets/javascripts/discourse/app/adapters/topic-list.js b/app/assets/javascripts/discourse/app/adapters/topic-list.js index 3d280047eb..bd45b85e09 100644 --- a/app/assets/javascripts/discourse/app/adapters/topic-list.js +++ b/app/assets/javascripts/discourse/app/adapters/topic-list.js @@ -1,6 +1,6 @@ import { ajax } from "discourse/lib/ajax"; import RestAdapter from "discourse/adapters/rest"; -import PreloadStore from "preload-store"; +import PreloadStore from "discourse/lib/preload-store"; export function finderFor(filter, params) { return function() { diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js index 8080da1af6..b484afcf52 100644 --- a/app/assets/javascripts/discourse/app/app.js +++ b/app/assets/javascripts/discourse/app/app.js @@ -2,24 +2,43 @@ import Application from "@ember/application"; import { computed } from "@ember/object"; import { buildResolver } from "discourse-common/resolver"; +import { bind } from "@ember/runloop"; import discourseComputed, { observes } from "discourse-common/utils/decorators"; -import FocusEvent from "discourse-common/mixins/focus-event"; const _pluginCallbacks = []; -const Discourse = Application.extend(FocusEvent, { +const Discourse = Application.extend({ rootElement: "#main", _docTitle: document.title, - RAW_TEMPLATES: {}, __widget_helpers: {}, + hasFocus: null, + _boundFocusChange: null, + customEvents: { paste: "paste" }, reset() { this._super(...arguments); - Mousetrap.reset(); + + document.removeEventListener("visibilitychange", this._boundFocusChange); + document.removeEventListener("resume", this._boundFocusChange); + document.removeEventListener("freeze", this._boundFocusChange); + + this._boundFocusChange = null; + }, + + ready() { + this._super(...arguments); + this._boundFocusChange = bind(this, this._focusChanged); + + // Default to true + this.set("hasFocus", true); + + document.addEventListener("visibilitychange", this._boundFocusChange); + document.addEventListener("resume", this._boundFocusChange); + document.addEventListener("freeze", this._boundFocusChange); }, getURL(url) { @@ -29,18 +48,18 @@ const Discourse = Application.extend(FocusEvent, { if (url !== "/" && !/^\/[^\/]/.test(url)) return url; if (url[0] !== "/") url = "/" + url; - if (url.startsWith(Discourse.BaseUri)) return url; + if (url.startsWith(this.BaseUri)) return url; - return Discourse.BaseUri + url; + return this.BaseUri + url; }, getURLWithCDN(url) { - url = Discourse.getURL(url); + url = this.getURL(url); // only relative urls - if (Discourse.CDN && /^\/[^\/]/.test(url)) { - url = Discourse.CDN + url; - } else if (Discourse.S3CDN) { - url = url.replace(Discourse.S3BaseUrl, Discourse.S3CDN); + if (this.CDN && /^\/[^\/]/.test(url)) { + url = this.CDN + url; + } else if (this.S3CDN) { + url = url.replace(this.S3BaseUrl, this.S3CDN); } return url; }, @@ -49,7 +68,7 @@ const Discourse = Application.extend(FocusEvent, { @observes("_docTitle", "hasFocus", "contextCount", "notificationCount") _titleChanged() { - let title = this._docTitle || Discourse.SiteSettings.title; + let title = this._docTitle || this.SiteSettings.title; let displayCount = this.displayCount; let dynamicFavicon = this.currentUser && this.currentUser.dynamic_favicon; @@ -71,13 +90,13 @@ const Discourse = Application.extend(FocusEvent, { @observes("contextCount", "notificationCount") faviconChanged() { if (this.currentUser && this.currentUser.get("dynamic_favicon")) { - let url = Discourse.SiteSettings.site_favicon_url; + let url = this.SiteSettings.site_favicon_url; // Since the favicon is cached on the browser for a really long time, we // append the favicon_url as query params to the path so that the cache // is not used when the favicon changes. if (/^http/.test(url)) { - url = Discourse.getURL("/favicon/proxied?" + encodeURIComponent(url)); + url = this.getURL("/favicon/proxied?" + encodeURIComponent(url)); } var displayCount = this.displayCount; @@ -117,58 +136,42 @@ const Discourse = Application.extend(FocusEvent, { authenticationComplete(options) { // TODO, how to dispatch this to the controller without the container? - const loginController = Discourse.__container__.lookup("controller:login"); + const loginController = this.__container__.lookup("controller:login"); return loginController.authenticationComplete(options); }, + _prepareInitializer(moduleName) { + const module = requirejs(moduleName, null, null, true); + if (!module) { + throw new Error(moduleName + " must export an initializer."); + } + + const init = module.default; + const oldInitialize = init.initialize; + init.initialize = () => oldInitialize.call(init, this.__container__, this); + return init; + }, + // Start up the Discourse application by running all the initializers we've defined. start() { $("noscript").remove(); - Object.keys(requirejs._eak_seen).forEach(function(key) { + Object.keys(requirejs._eak_seen).forEach(key => { if (/\/pre\-initializers\//.test(key)) { - const module = requirejs(key, null, null, true); - if (!module) { - throw new Error(key + " must export an initializer."); - } - - const init = module.default; - const oldInitialize = init.initialize; - init.initialize = function() { - oldInitialize.call(this, Discourse.__container__, Discourse); - }; - - Discourse.initializer(init); - } - }); - - Object.keys(requirejs._eak_seen).forEach(function(key) { - if (/\/initializers\//.test(key)) { - const module = requirejs(key, null, null, true); - if (!module) { - throw new Error(key + " must export an initializer."); - } - - const init = module.default; - const oldInitialize = init.initialize; - init.initialize = function() { - oldInitialize.call(this, Discourse.__container__, Discourse); - }; - - Discourse.instanceInitializer(init); + this.initializer(this._prepareInitializer(key)); + } else if (/\/initializers\//.test(key)) { + this.instanceInitializer(this._prepareInitializer(key)); } }); // Plugins that are registered via `[/img]" - html = '

' + html = '

' expect(cooked).to eq(html) end @@ -1433,10 +1433,10 @@ HTML html = <<~HTML

title with | title
-
-
+
+
stuff
-

+

HTML expect(cooked).to eq(html.strip) @@ -1452,11 +1452,11 @@ HTML MD html = <<~HTML -


-
-
-
-

+


+
+
+
+

HTML expect(cooked).to eq(html.strip) diff --git a/spec/components/promotion_spec.rb b/spec/components/promotion_spec.rb index 8f29ef2725..232715f9fe 100644 --- a/spec/components/promotion_spec.rb +++ b/spec/components/promotion_spec.rb @@ -124,6 +124,8 @@ describe Promotion do context "that has done the requisite things" do before do + SiteSetting.tl2_requires_topic_reply_count = 3 + stat = user.user_stat stat.topics_entered = SiteSetting.tl2_requires_topics_entered stat.posts_read_count = SiteSetting.tl2_requires_read_posts @@ -131,7 +133,10 @@ describe Promotion do stat.days_visited = SiteSetting.tl2_requires_days_visited * 60 stat.likes_received = SiteSetting.tl2_requires_likes_received stat.likes_given = SiteSetting.tl2_requires_likes_given - stat.topic_reply_count = SiteSetting.tl2_requires_topic_reply_count + SiteSetting.tl2_requires_topic_reply_count.times do |_| + topic = Fabricate(:topic) + reply = Fabricate(:post, topic: topic, user: user, post_number: 2) + end @result = promotion.review end @@ -148,6 +153,7 @@ describe Promotion do context "when the account hasn't existed long enough" do it "does not promote the user" do user.created_at = 1.minute.ago + SiteSetting.tl2_requires_topic_reply_count = 3 stat = user.user_stat stat.topics_entered = SiteSetting.tl2_requires_topics_entered @@ -156,7 +162,10 @@ describe Promotion do stat.days_visited = SiteSetting.tl2_requires_days_visited * 60 stat.likes_received = SiteSetting.tl2_requires_likes_received stat.likes_given = SiteSetting.tl2_requires_likes_given - stat.topic_reply_count = SiteSetting.tl2_requires_topic_reply_count + SiteSetting.tl2_requires_topic_reply_count.times do |_| + topic = Fabricate(:topic) + reply = Fabricate(:post, topic: topic, user: user, post_number: 2) + end result = promotion.review expect(result).to eq(false) diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb index 64e0efb726..599ea3c5aa 100644 --- a/spec/components/search_spec.rb +++ b/spec/components/search_spec.rb @@ -444,7 +444,7 @@ describe Search do end let(:expected_blurb) do - "...to satisfy any test conditions that require content longer than the typical test post raw content. elephant" + "...quire content longer than the typical test post raw content. It really is some long content, folks. elephant" end it 'returns the post' do @@ -1134,13 +1134,11 @@ describe Search do it 'can find posts with images' do post_uploaded = Fabricate(:post_with_uploaded_image) - post_with_image_urls = Fabricate(:post_with_image_urls) Fabricate(:post) CookedPostProcessor.new(post_uploaded).update_post_image - CookedPostProcessor.new(post_with_image_urls).update_post_image - expect(Search.execute('with:images').posts.map(&:id)).to contain_exactly(post_uploaded.id, post_with_image_urls.id) + expect(Search.execute('with:images').posts.map(&:id)).to contain_exactly(post_uploaded.id) end it 'can find by latest' do diff --git a/spec/components/svg_sprite/svg_sprite_spec.rb b/spec/components/svg_sprite/svg_sprite_spec.rb index 34e4d59b13..4a3100a5aa 100644 --- a/spec/components/svg_sprite/svg_sprite_spec.rb +++ b/spec/components/svg_sprite/svg_sprite_spec.rb @@ -216,12 +216,12 @@ describe SvgSprite do end it "includes Font Awesome 4.7 icons as group flair" do - group = Fabricate(:group, flair_url: "fa-air-freshener") + group = Fabricate(:group, flair_icon: "fa-air-freshener") expect(SvgSprite.bundle).to match(/air-freshener/) end it "includes Font Awesome 5 icons as group flair" do - group = Fabricate(:group, flair_url: "far fa-building") + group = Fabricate(:group, flair_icon: "far fa-building") expect(SvgSprite.bundle).to match(/building/) end end diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb index 0bafbbb1b3..d6e56a069d 100644 --- a/spec/components/topic_query_spec.rb +++ b/spec/components/topic_query_spec.rb @@ -265,7 +265,7 @@ describe TopicQuery do end context 'muted categories' do - it 'is removed from new and latest lists' do + it 'is removed from top, new and latest lists' do category = Fabricate(:category_with_definition) topic = Fabricate(:topic, category: category) CategoryUser.create!(user_id: user.id, @@ -273,6 +273,8 @@ describe TopicQuery do notification_level: CategoryUser.notification_levels[:muted]) expect(topic_query.list_new.topics.map(&:id)).not_to include(topic.id) expect(topic_query.list_latest.topics.map(&:id)).not_to include(topic.id) + TopTopic.create!(topic: topic, all_score: 1) + expect(topic_query.list_top_for(:all).topics.map(&:id)).not_to include(topic.id) end end diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb index 16ee55dab0..d55a475c71 100644 --- a/spec/components/topic_view_spec.rb +++ b/spec/components/topic_view_spec.rb @@ -708,9 +708,12 @@ describe TopicView do end describe '#image_url' do - let!(:post1) { Fabricate(:post, topic: topic) } - let!(:post2) { Fabricate(:post, topic: topic) } - let!(:post3) { Fabricate(:post, topic: topic).tap { |p| p.update_column(:image_url, "post3_image.png") }.reload } + fab!(:op_upload) { Fabricate(:image_upload) } + fab!(:post3_upload) { Fabricate(:image_upload) } + + fab!(:post1) { Fabricate(:post, topic: topic) } + fab!(:post2) { Fabricate(:post, topic: topic) } + fab!(:post3) { Fabricate(:post, topic: topic).tap { |p| p.update_column(:image_upload_id, post3_upload.id) }.reload } def topic_view_for_post(post_number) TopicView.new(topic.id, evil_trout, post_number: post_number) @@ -718,14 +721,14 @@ describe TopicView do context "when op has an image" do before do - topic.update_column(:image_url, "op_image.png") - post1.update_column(:image_url, "op_image.png") + topic.update_column(:image_upload_id, op_upload.id) + post1.update_column(:image_upload_id, op_upload.id) end it "uses the topic image as a fallback when posts have no image" do - expect(topic_view_for_post(1).image_url).to eq("op_image.png") - expect(topic_view_for_post(2).image_url).to eq("op_image.png") - expect(topic_view_for_post(3).image_url).to eq("post3_image.png") + expect(topic_view_for_post(1).image_url).to end_with(op_upload.url) + expect(topic_view_for_post(2).image_url).to end_with(op_upload.url) + expect(topic_view_for_post(3).image_url).to end_with(post3_upload.url) end end @@ -733,7 +736,7 @@ describe TopicView do it "returns nil when posts have no image" do expect(topic_view_for_post(1).image_url).to eq(nil) expect(topic_view_for_post(2).image_url).to eq(nil) - expect(topic_view_for_post(3).image_url).to eq("post3_image.png") + expect(topic_view_for_post(3).image_url).to end_with(post3_upload.url) end end end diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb index 412504c7c4..77a234d981 100644 --- a/spec/fabricators/post_fabricator.rb +++ b/spec/fabricators/post_fabricator.rb @@ -10,7 +10,7 @@ end Fabricator(:post_with_long_raw_content, from: :post) do raw 'This is a sample post with semi-long raw content. The raw content is also more than two hundred characters to satisfy any test conditions that require content longer - than the typical test post raw content.' + than the typical test post raw content. It really is some long content, folks.' end Fabricator(:post_with_youtube, from: :post) do @@ -56,7 +56,7 @@ HTML end Fabricator(:post_with_uploaded_image, from: :post) do - raw "" + raw { "" } end Fabricator(:post_with_an_attachment, from: :post) do diff --git a/spec/fabricators/web_hook_fabricator.rb b/spec/fabricators/web_hook_fabricator.rb index 4647251080..9edc591791 100644 --- a/spec/fabricators/web_hook_fabricator.rb +++ b/spec/fabricators/web_hook_fabricator.rb @@ -71,22 +71,6 @@ Fabricator(:tag_web_hook, from: :web_hook) do end end -Fabricator(:flag_web_hook, from: :web_hook) do - transient flag_hook: WebHookEventType.find_by(name: 'flag') - - after_build do |web_hook, transients| - web_hook.web_hook_event_types = [transients[:flag_hook]] - end -end - -Fabricator(:queued_post_web_hook, from: :web_hook) do - transient queued_post_hook: WebHookEventType.find_by(name: 'queued_post') - - after_build do |web_hook, transients| - web_hook.web_hook_event_types = [transients[:queued_post_hook]] - end -end - Fabricator(:reviewable_web_hook, from: :web_hook) do transient reviewable_hook: WebHookEventType.find_by(name: 'reviewable') diff --git a/spec/fixtures/db/post_migrate/change/20990309014015_drop_email_logs.rb b/spec/fixtures/db/post_migrate/change/20990309014015_drop_email_logs.rb new file mode 100644 index 0000000000..7b4b1e2252 --- /dev/null +++ b/spec/fixtures/db/post_migrate/change/20990309014015_drop_email_logs.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class DropEmailLogs < ActiveRecord::Migration[5.2] + DROPPED_TABLES ||= %i{email_logs} + + def change + drop_table :email_logs + raise ActiveRecord::Rollback + end +end diff --git a/spec/fixtures/json/import-export.json b/spec/fixtures/json/import-export.json index f991e7f2c4..f852a9def1 100644 --- a/spec/fixtures/json/import-export.json +++ b/spec/fixtures/json/import-export.json @@ -4,12 +4,12 @@ {"id":42,"name":"custom_group_import","created_at":"2017-10-26T15:33:46.328Z","automatic_membership_email_domains":"","primary_group":false,"title":null,"grant_trust_level":null,"incoming_email":null,"bio_raw":"This is a custom group import","allow_membership_requests":false,"full_name":"Custom Group Import","default_notification_level":3,"visibility_level":0,"public_exit":false,"public_admission":false,"membership_request_template":"","messageable_level":0,"mentionable_level":0,"members_visibility_level":0,"publish_read_state":false,"user_ids":[2]} ], "categories":[ - {"id":8,"name":"Custom Category","color":"0088CC","created_at":"2017-10-26T15:32:44.083Z","user_id":1,"slug":"custom-category","description":null,"text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":3,"auto_close_based_on_last_post":false,"topic_template":"","all_topics_wiki":false,"permissions_params":{"custom_group":1,"everyone":2}}, - {"id":10,"name":"Site Feedback Import","color":"27AA5B","created_at":"2017-10-26T17:12:39.995Z","user_id":-1,"slug":"site-feedback-import","description":"Discussion about this site, its organization, how it works, and how we can improve it.","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{}}, - {"id":11,"name":"Uncategorized Import","color":"0088CC","created_at":"2017-10-26T17:12:32.359Z","user_id":-1,"slug":"uncategorized-import","description":"","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{}}, - {"id":12,"name":"Lounge Import","color":"A461EF","created_at":"2017-10-26T17:12:39.490Z","user_id":-1,"slug":"lounge-import","description":"A category exclusive to members with trust level 3 and higher.","text_color":"652D90","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{"trust_level_3":1}}, - {"id":13,"name":"Staff Import","color":"E45735","created_at":"2017-10-26T17:12:42.806Z","user_id":2,"slug":"staff-import","description":"Private category for staff discussions. Topics are only visible to admins and moderators.","text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"staff":1}}, - {"id":15,"name":"Custom Category Import","color":"0088CC","created_at":"2017-10-26T15:32:44.083Z","user_id":2,"slug":"custom-category-import","description":null,"text_color":"FFFFFF","auto_close_hours":null,"parent_category_id":10,"auto_close_based_on_last_post":false,"topic_template":"","all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"everyone":2}} + {"id":8,"name":"Custom Category","color":"0088CC","created_at":"2017-10-26T15:32:44.083Z","user_id":1,"slug":"custom-category","description":null,"text_color":"FFFFFF","auto_close_hours":null,"position":1,"parent_category_id":3,"auto_close_based_on_last_post":false,"topic_template":"","all_topics_wiki":false,"permissions_params":{"custom_group":1,"everyone":2}}, + {"id":10,"name":"Site Feedback Import","color":"27AA5B","created_at":"2017-10-26T17:12:39.995Z","user_id":-1,"slug":"site-feedback-import","description":"Discussion about this site, its organization, how it works, and how we can improve it.","text_color":"FFFFFF","auto_close_hours":null,"position":2,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{}}, + {"id":11,"name":"Uncategorized Import","color":"0088CC","created_at":"2017-10-26T17:12:32.359Z","user_id":-1,"slug":"uncategorized-import","description":"","text_color":"FFFFFF","auto_close_hours":null,"position":0,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{}}, + {"id":12,"name":"Lounge Import","color":"A461EF","created_at":"2017-10-26T17:12:39.490Z","user_id":-1,"slug":"lounge-import","description":"A category exclusive to members with trust level 3 and higher.","text_color":"652D90","auto_close_hours":null,"position":3,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{"trust_level_3":1}}, + {"id":13,"name":"Staff Import","color":"E45735","created_at":"2017-10-26T17:12:42.806Z","user_id":2,"slug":"staff-import","description":"Private category for staff discussions. Topics are only visible to admins and moderators.","text_color":"FFFFFF","auto_close_hours":null,"position":5,"parent_category_id":null,"auto_close_based_on_last_post":false,"topic_template":null,"all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"staff":1}}, + {"id":15,"name":"Custom Category Import","color":"0088CC","created_at":"2017-10-26T15:32:44.083Z","user_id":2,"slug":"custom-category-import","description":null,"text_color":"FFFFFF","auto_close_hours":null,"position":1,"parent_category_id":10,"auto_close_based_on_last_post":false,"topic_template":"","all_topics_wiki":false,"permissions_params":{"custom_group_import":1,"everyone":2}} ], "users":[ {"id":1,"email":"email@example.com","username":"example","name":"Example","created_at":"2017-10-07T15:01:24.597Z","trust_level":4,"active":true,"last_emailed_at":null}, diff --git a/spec/integration/api_keys_spec.rb b/spec/integration/api_keys_spec.rb new file mode 100644 index 0000000000..451768718f --- /dev/null +++ b/spec/integration/api_keys_spec.rb @@ -0,0 +1,89 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'api keys' do + let(:user) { Fabricate(:user) } + let(:api_key) { ApiKey.create!(user_id: user.id, created_by_id: Discourse.system_user) } + + it 'works in headers' do + get '/session/current.json', headers: { + HTTP_API_KEY: api_key.key + } + expect(response.status).to eq(200) + expect(response.parsed_body["current_user"]["username"]).to eq(user.username) + end + + it 'does not work in parameters' do + get '/session/current.json', params: { + api_key: api_key.key + } + expect(response.status).to eq(404) + end + + it 'allows parameters on ics routes' do + get "/u/#{user.username}/bookmarks.ics?api_key=#{api_key.key}&api_username=#{user.username.downcase}" + expect(response.status).to eq(200) + + # Confirm not for JSON + get "/u/#{user.username}/bookmarks.json?api_key=#{api_key.key}&api_username=#{user.username.downcase}" + expect(response.status).to eq(403) + end + + it 'allows parameters for handle mail' do + admin_api_key = ApiKey.create!(user: Fabricate(:admin), created_by_id: Discourse.system_user) + + post "/admin/email/handle_mail.json?api_key=#{admin_api_key.key}", params: { email: "blah" } + expect(response.status).to eq(200) + end + + it 'allows parameters for rss feeds' do + SiteSetting.login_required = true + + get "/latest.rss?api_key=#{api_key.key}&api_username=#{user.username.downcase}" + expect(response.status).to eq(200) + + # Confirm not allowed for json + get "/latest.json?api_key=#{api_key.key}&api_username=#{user.username.downcase}" + expect(response.status).to eq(302) + end + +end + +describe 'user api keys' do + let(:user) { Fabricate(:user) } + let(:user_api_key) { Fabricate(:readonly_user_api_key, user: user) } + + it 'updates last used time on use' do + freeze_time + + user_api_key.update_columns(last_used_at: 7.days.ago) + + get '/session/current.json', headers: { + HTTP_USER_API_KEY: user_api_key.key, + } + + expect(user_api_key.reload.last_used_at).to eq_time(Time.zone.now) + end + + it 'allows parameters on ics routes' do + get "/u/#{user.username}/bookmarks.ics?user_api_key=#{user_api_key.key}" + expect(response.status).to eq(200) + + # Confirm not for JSON + get "/u/#{user.username}/bookmarks.json?user_api_key=#{user_api_key.key}" + expect(response.status).to eq(403) + end + + it 'allows parameters for rss feeds' do + SiteSetting.login_required = true + + get "/latest.rss?user_api_key=#{user_api_key.key}" + expect(response.status).to eq(200) + + # Confirm not allowed for json + get "/latest.json?user_api_key=#{user_api_key.key}" + expect(response.status).to eq(302) + end + +end diff --git a/spec/integration/email_style_spec.rb b/spec/integration/email_style_spec.rb index 395dd19df1..42203ecdfe 100644 --- a/spec/integration/email_style_spec.rb +++ b/spec/integration/email_style_spec.rb @@ -6,9 +6,10 @@ describe EmailStyle do context "ERB evaluation" do it "does not evaluate ERB outside of the email itself" do - SiteSetting.email_custom_template = "
%{email_content}
<%= (111 * 333) %>" + SiteSetting.email_custom_template = "%{email_content}<%= (111 * 333) %>" html = Email::Renderer.new(UserNotifications.signup(Fabricate(:user))).html expect(html).not_to match("36963") + expect(html.starts_with?('')).to eq(true) end end diff --git a/spec/integration/invite_only_registration_spec.rb b/spec/integration/invite_only_registration_spec.rb index 5f19efb60f..811ad4ed93 100644 --- a/spec/integration/invite_only_registration_spec.rb +++ b/spec/integration/invite_only_registration_spec.rb @@ -24,7 +24,7 @@ describe 'invite only' do HTTP_API_USERNAME: admin.username } - user_id = JSON.parse(response.body)["user_id"] + user_id = response.parsed_body["user_id"] expect(user_id).to be > 0 # activate and approve diff --git a/spec/integration/rate_limiting_spec.rb b/spec/integration/rate_limiting_spec.rb index 9a41f9120f..a623d7aa22 100644 --- a/spec/integration/rate_limiting_spec.rb +++ b/spec/integration/rate_limiting_spec.rb @@ -74,7 +74,7 @@ describe 'rate limiter integration' do expect(response.status).to eq(429) - data = JSON.parse(response.body) + data = response.parsed_body expect(response.headers['Retry-After']).to eq(60) expect(data["extras"]["wait_seconds"]).to eq(60) diff --git a/spec/integration/topic_thumbnail_spec.rb b/spec/integration/topic_thumbnail_spec.rb new file mode 100644 index 0000000000..dcdbb084d5 --- /dev/null +++ b/spec/integration/topic_thumbnail_spec.rb @@ -0,0 +1,121 @@ +# frozen_string_literal: true +require 'rails_helper' + +describe "Topic Thumbnails" do + before { SiteSetting.create_thumbnails = true } + + fab!(:image) { Fabricate(:image_upload, width: 5000, height: 5000) } + fab!(:topic) { Fabricate(:topic, image_upload_id: image.id) } + fab!(:user) { Fabricate(:user) } + + context 'latest' do + def get_topic + Discourse.redis.del(topic.thumbnail_job_redis_key(Topic.thumbnail_sizes)) + get '/latest.json' + response.parsed_body["topic_list"]["topics"][0] + end + + it "includes thumbnails" do + topic_json = nil + expect do + topic_json = get_topic + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1) + + thumbnails = topic_json["thumbnails"] + + # Original only. Optimized not yet generated + expect(thumbnails.length).to eq(1) + + # Original + expect(thumbnails[0]["max_width"]).to eq(nil) + expect(thumbnails[0]["max_height"]).to eq(nil) + expect(thumbnails[0]["width"]).to eq(image.width) + expect(thumbnails[0]["height"]).to eq(image.height) + expect(thumbnails[0]["url"]).to end_with(image.url) + + # Run the job + args = Jobs::GenerateTopicThumbnails.jobs.last["args"].first + Jobs::GenerateTopicThumbnails.new.execute(args.with_indifferent_access) + + # Re-request + expect do + topic_json = get_topic + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(0) + thumbnails = topic_json["thumbnails"] + + expect(thumbnails[1]["max_width"]).to eq(Topic.share_thumbnail_size[0]) + expect(thumbnails[1]["max_height"]).to eq(Topic.share_thumbnail_size[1]) + expect(thumbnails[1]["width"]).to eq(1024) + expect(thumbnails[1]["height"]).to eq(1024) + expect(thumbnails[1]["url"]).to include("/optimized/") + end + + context "with a theme" do + before do + theme = Fabricate(:theme) + theme.theme_modifier_set.topic_thumbnail_sizes = [ + [100, 100], + [200, 200], + [300, 300] + ] + theme.theme_modifier_set.save! + theme.set_default! + end + + it "includes the theme specified resolutions" do + topic_json = nil + + expect do + topic_json = get_topic + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1) + + # Run the job + args = Jobs::GenerateTopicThumbnails.jobs.last["args"].first + Jobs::GenerateTopicThumbnails.new.execute(args.with_indifferent_access) + + # Request again + expect do + topic_json = get_topic + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(0) + + thumbnails = topic_json["thumbnails"] + + # Original + Optimized + 3 theme requests + expect(thumbnails.length).to eq(5) + end + end + + context "with a plugin" do + before do + plugin = Plugin::Instance.new + plugin.register_topic_thumbnail_size [512, 512] + end + + after do + DiscoursePluginRegistry.reset! + end + + it "includes the theme specified resolutions" do + topic_json = nil + + expect do + topic_json = get_topic + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1) + + # Run the job + args = Jobs::GenerateTopicThumbnails.jobs.last["args"].first + Jobs::GenerateTopicThumbnails.new.execute(args.with_indifferent_access) + + # Request again + expect do + topic_json = get_topic + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(0) + + thumbnails = topic_json["thumbnails"] + + # Original + Optimized + 1 plugin request + expect(thumbnails.length).to eq(3) + end + end + end +end diff --git a/spec/integration/user_api_keys_spec.rb b/spec/integration/user_api_keys_spec.rb deleted file mode 100644 index 5bbdff319e..0000000000 --- a/spec/integration/user_api_keys_spec.rb +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe 'user api keys integration' do - it 'updates last used time on use' do - freeze_time - - user_api_key = Fabricate(:readonly_user_api_key) - user_api_key.update_columns(last_used_at: 7.days.ago) - - get '/session/current.json', headers: { - HTTP_USER_API_KEY: user_api_key.key, - } - - expect(user_api_key.reload.last_used_at).to eq_time(Time.zone.now) - end -end diff --git a/spec/integrity/js_constants_spec.rb b/spec/integrity/js_constants_spec.rb new file mode 100644 index 0000000000..c0c52d6f79 --- /dev/null +++ b/spec/integrity/js_constants_spec.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +require "rails_helper" + +describe "constants match ruby" do + + let(:ctx) { MiniRacer::Context.new } + + def parse(file) + # mini racer doesn't handle JS modules so we'll do this hack + source = File.read("#{Rails.root}/app/assets/javascripts/#{file}") + source.gsub!(/^export */, '') + ctx.eval(source) + end + + it "has the correct values" do + parse("discourse/app/lib/constants.js") + parse("pretty-text/addon/emoji/version.js") + + priorities = ctx.eval("SEARCH_PRIORITIES") + Searchable::PRIORITIES.each do |key, value| + expect(priorities[key.to_s]).to eq(value) + end + + expect(ctx.eval("SEARCH_PHRASE_REGEXP")).to eq(Search::PHRASE_MATCH_REGEXP_PATTERN) + expect(ctx.eval("IMAGE_VERSION")).to eq(Emoji::EMOJI_VERSION) + end + +end diff --git a/spec/jobs/bookmark_reminder_notifications_spec.rb b/spec/jobs/bookmark_reminder_notifications_spec.rb index 58f7262503..25379d0ba3 100644 --- a/spec/jobs/bookmark_reminder_notifications_spec.rb +++ b/spec/jobs/bookmark_reminder_notifications_spec.rb @@ -22,7 +22,7 @@ RSpec.describe Jobs::BookmarkReminderNotifications do bookmark1.update_column(:reminder_at, five_minutes_ago - 10.minutes) bookmark2.update_column(:reminder_at, five_minutes_ago - 5.minutes) bookmark3.update_column(:reminder_at, five_minutes_ago) - Discourse.redis.flushall + Discourse.redis.flushdb end it "sends every reminder and marks the reminder_at to nil for all bookmarks, as well as last sent date" do @@ -48,28 +48,6 @@ RSpec.describe Jobs::BookmarkReminderNotifications do expect(bookmark4.reload.reminder_at).not_to eq(nil) end - it "increments the job run number correctly and resets to 1 when it reaches 6" do - expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq(nil) - subject.execute - expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('1') - subject.execute - subject.execute - subject.execute - subject.execute - subject.execute - expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('6') - subject.execute - expect(Discourse.redis.get(described_class::JOB_RUN_NUMBER_KEY)).to eq('1') - end - - context "when one of the bookmark reminder types is at_desktop" do - let(:bookmark1) { Fabricate(:bookmark, reminder_type: :at_desktop) } - it "is not included in the run, because it is not time-based" do - BookmarkManager.any_instance.expects(:send_reminder_notification).with(bookmark1.id).never - subject.execute - end - end - context "when the number of notifications exceed max_reminder_notifications_per_run" do it "does not send them in the current run, but will send them in the next" do begin @@ -81,50 +59,4 @@ RSpec.describe Jobs::BookmarkReminderNotifications do end end end - - context "when this is the 6th run (so every half hour) of this job we need to ensure consistency of at_desktop reminders" do - let(:set_at) { Time.zone.now } - let!(:bookmark) do - Fabricate( - :bookmark, - reminder_type: Bookmark.reminder_types[:at_desktop], - reminder_at: nil, - reminder_set_at: set_at - ) - end - before do - Discourse.redis.set(Jobs::BookmarkReminderNotifications::JOB_RUN_NUMBER_KEY, 6) - bookmark.user.update(last_seen_at: Time.zone.now - 1.minute) - end - context "when an at_desktop reminder is not pending in redis for a user who should have one" do - it "puts the pending reminder into redis" do - expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false) - subject.execute - expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(true) - end - - context "if the user has not been seen in the past 24 hours" do - before do - bookmark.user.update(last_seen_at: Time.zone.now - 25.hours) - end - it "does not put the pending reminder into redis" do - subject.execute - expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false) - end - end - - context "if the at_desktop reminder is expired (set over PENDING_AT_DESKTOP_EXPIRY_DAYS days ago)" do - let(:set_at) { Time.zone.now - (BookmarkReminderNotificationHandler::PENDING_AT_DESKTOP_EXPIRY_DAYS + 1).days } - it "does not put the pending reminder into redis, and clears the reminder type/time" do - expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false) - subject.execute - expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(bookmark.user)).to eq(false) - bookmark.reload - expect(bookmark.reminder_set_at).to eq(nil) - expect(bookmark.reminder_last_sent_at).to eq(nil) - expect(bookmark.reminder_type).to eq(nil) - end - end - end - end end diff --git a/spec/jobs/migrate_group_flair_images_spec.rb b/spec/jobs/migrate_group_flair_images_spec.rb new file mode 100644 index 0000000000..ff3428fc98 --- /dev/null +++ b/spec/jobs/migrate_group_flair_images_spec.rb @@ -0,0 +1,40 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Jobs::MigrateGroupFlairImages do + let(:image_url) { "https://omg.aws.somestack/test.png" } + let(:group) { Fabricate(:group) } + + before do + stub_request(:get, image_url).to_return( + status: 200, body: file_from_fixtures("smallest.png").read + ) + @orig_logger = Rails.logger + Rails.logger = @fake_logger = FakeLogger.new + end + + after do + Rails.logger = @orig_logger + end + + it 'should migrate to the new group `flair_upload_id` column correctly' do + DB.exec(<<~SQL, flair_url: image_url) + UPDATE groups SET flair_url = :flair_url WHERE id = #{group.id} + SQL + + expect do + described_class.new.execute_onceoff({}) + end.to change { Upload.count }.by(1) + + group.reload + expect(group.flair_upload).to eq(Upload.last) + expect(group[:flair_url]).to eq(nil) + end + + it 'should skip groups with invalid flair URLs' do + DB.exec("UPDATE groups SET flair_url = 'abc' WHERE id = #{group.id}") + described_class.new.execute_onceoff({}) + expect(Rails.logger.warnings.count).to eq(0) + end +end diff --git a/spec/jobs/tl3_promotions_spec.rb b/spec/jobs/tl3_promotions_spec.rb index f76007df55..6bb23fca83 100644 --- a/spec/jobs/tl3_promotions_spec.rb +++ b/spec/jobs/tl3_promotions_spec.rb @@ -8,7 +8,6 @@ describe Jobs::Tl3Promotions do user.create_user_stat if user.user_stat.nil? user.user_stat.update!( days_visited: 1000, - topic_reply_count: 1000, topics_entered: 1000, posts_read_count: 1000, likes_given: 1000, diff --git a/spec/lib/backup_restore/database_restorer_spec.rb b/spec/lib/backup_restore/database_restorer_spec.rb index 9f1cc0c935..8a7b9ec8a9 100644 --- a/spec/lib/backup_restore/database_restorer_spec.rb +++ b/spec/lib/backup_restore/database_restorer_spec.rb @@ -155,7 +155,7 @@ describe BackupRestore::DatabaseRestorer do context "readonly functions" do before do - Migration::SafeMigrate.stubs(:post_migration_path).returns("spec/fixtures/db/post_migrate") + Migration::SafeMigrate.stubs(:post_migration_path).returns("spec/fixtures/db/post_migrate/drop_column") end it "doesn't try to drop function when no functions have been created" do @@ -164,12 +164,10 @@ describe BackupRestore::DatabaseRestorer do end it "creates and drops all functions when none exist" do - Migration::BaseDropper.expects(:create_readonly_function).with(:email_logs, nil) Migration::BaseDropper.expects(:create_readonly_function).with(:posts, :via_email) Migration::BaseDropper.expects(:create_readonly_function).with(:posts, :raw_email) execute_stubbed_restore(stub_readonly_functions: false) - Migration::BaseDropper.expects(:drop_readonly_function).with(:email_logs, nil) Migration::BaseDropper.expects(:drop_readonly_function).with(:posts, :via_email) Migration::BaseDropper.expects(:drop_readonly_function).with(:posts, :raw_email) subject.clean_up diff --git a/spec/lib/bookmark_manager_spec.rb b/spec/lib/bookmark_manager_spec.rb index 34b029b515..6aabf79824 100644 --- a/spec/lib/bookmark_manager_spec.rb +++ b/spec/lib/bookmark_manager_spec.rb @@ -42,25 +42,25 @@ RSpec.describe BookmarkManager do end end - context "when the reminder type is at_desktop" do - let(:reminder_type) { 'at_desktop' } - let(:reminder_at) { nil } + context "when options are provided" do + let(:options) { { delete_when_reminder_sent: true } } - def create_bookmark - subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at) - end - - it "this is a special case which needs client-side logic and has no reminder_at datetime" do - create_bookmark + it "saves any additional options successfully" do + subject.create(post_id: post.id, name: name, options: options) bookmark = Bookmark.find_by(user: user) - expect(bookmark.reminder_at).to eq(nil) - expect(bookmark.reminder_type).to eq(Bookmark.reminder_types[:at_desktop]) + expect(bookmark.delete_when_reminder_sent).to eq(true) end + end - it "sets a redis key for the user so we know they have a pending at_desktop reminder" do - create_bookmark - expect(Discourse.redis.get("pending_at_desktop_bookmark_reminder_user_#{user.id}")).not_to eq(nil) + context "when options are provided with null values" do + let(:options) { { delete_when_reminder_sent: nil } } + + it "saves defaults successfully" do + subject.create(post_id: post.id, name: name, options: options) + bookmark = Bookmark.find_by(user: user) + + expect(bookmark.delete_when_reminder_sent).to eq(false) end end @@ -80,7 +80,7 @@ RSpec.describe BookmarkManager do it "adds an error to the manager" do subject.create(post_id: post.id, name: name, reminder_type: reminder_type, reminder_at: reminder_at) expect(subject.errors.full_messages).to include( - "Reminder at " + I18n.t("bookmarks.errors.time_must_be_provided", reminder_type: I18n.t("bookmarks.reminders.at_desktop")) + "Reminder at " + I18n.t("bookmarks.errors.time_must_be_provided") ) end end @@ -157,25 +157,6 @@ RSpec.describe BookmarkManager do expect { subject.destroy(9999) }.to raise_error(Discourse::NotFound) end end - - context "if the user has pending at desktop reminders for another bookmark" do - before do - Fabricate(:bookmark, user: user, post: Fabricate(:post), reminder_type: Bookmark.reminder_types[:at_desktop]) - BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user) - end - it "does not clear the at bookmark redis key" do - subject.destroy(bookmark.id) - expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(true) - end - end - - context "if the user has pending at desktop reminders for another bookmark" do - it "does clear the at bookmark redis key" do - BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user) - subject.destroy(bookmark.id) - expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(false) - end - end end describe ".update" do @@ -183,14 +164,19 @@ RSpec.describe BookmarkManager do let(:new_name) { "Some new name" } let(:new_reminder_at) { 10.days.from_now } let(:new_reminder_type) { Bookmark.reminder_types[:custom] } + let(:options) { {} } def update_bookmark subject.update( - bookmark_id: bookmark.id, name: new_name, reminder_type: new_reminder_type, reminder_at: new_reminder_at + bookmark_id: bookmark.id, + name: new_name, + reminder_type: new_reminder_type, + reminder_at: new_reminder_at, + options: options ) end - it "saves the time and new reminder type sucessfully" do + it "saves the time and new reminder type and new name sucessfully" do update_bookmark bookmark.reload expect(bookmark.name).to eq(new_name) @@ -198,6 +184,16 @@ RSpec.describe BookmarkManager do expect(bookmark.reminder_type).to eq(new_reminder_type) end + context "when options are provided" do + let(:options) { { delete_when_reminder_sent: true } } + + it "saves any additional options successfully" do + update_bookmark + bookmark.reload + expect(bookmark.delete_when_reminder_sent).to eq(true) + end + end + context "if the new reminder type is a string" do let(:new_reminder_type) { "custom" } it "is parsed" do @@ -241,25 +237,6 @@ RSpec.describe BookmarkManager do expect(Bookmark.where(user: user2, topic: topic).length).to eq(1) end - context "if the user has pending at desktop reminders for another bookmark" do - before do - Fabricate(:bookmark, user: user, post: Fabricate(:post), reminder_type: Bookmark.reminder_types[:at_desktop]) - BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user) - end - it "does not clear the at bookmark redis key" do - subject.destroy_for_topic(topic) - expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(true) - end - end - - context "if the user has pending at desktop reminders for another bookmark" do - it "does clear the at bookmark redis key" do - BookmarkReminderNotificationHandler.cache_pending_at_desktop_reminder(user) - subject.destroy_for_topic(topic) - expect(BookmarkReminderNotificationHandler.user_has_pending_at_desktop_reminders?(user)).to eq(false) - end - end - it "updates the topic user bookmarked column to false" do TopicUser.create(user: user, topic: topic, bookmarked: true) subject.destroy_for_topic(topic) diff --git a/spec/lib/bookmark_reminder_notification_handler_spec.rb b/spec/lib/bookmark_reminder_notification_handler_spec.rb index 318a52429a..3d9a6d77f6 100644 --- a/spec/lib/bookmark_reminder_notification_handler_spec.rb +++ b/spec/lib/bookmark_reminder_notification_handler_spec.rb @@ -8,7 +8,7 @@ RSpec.describe BookmarkReminderNotificationHandler do fab!(:user) { Fabricate(:user) } before do - Discourse.redis.flushall + Discourse.redis.flushdb end describe "#send_notification" do @@ -28,6 +28,20 @@ RSpec.describe BookmarkReminderNotificationHandler do expect(data["bookmark_name"]).to eq(bookmark.name) end + it "clears the reminder" do + subject.send_notification(bookmark) + bookmark.reload + expect(bookmark.reload.no_reminder?).to eq(true) + end + + context "when the delete_when_reminder_sent boolean is true " do + it "deletes the bookmark after the reminder gets sent" do + bookmark.update(delete_when_reminder_sent: true) + subject.send_notification(bookmark) + expect(Bookmark.find_by(id: bookmark.id)).to eq(nil) + end + end + context "when the post has been deleted" do it "clears the reminder and does not send a notification" do bookmark.post.trash! @@ -37,60 +51,4 @@ RSpec.describe BookmarkReminderNotificationHandler do end end end - - describe "#send_at_desktop_reminder" do - fab!(:reminder) do - Fabricate( - :bookmark, - user: user, - reminder_type: Bookmark.reminder_types[:at_desktop], - reminder_at: nil, - reminder_set_at: Time.zone.now - ) - end - let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" } - - context "when there are pending bookmark at desktop reminders" do - before do - described_class.cache_pending_at_desktop_reminder(user) - end - - context "when the user agent is for mobile" do - let(:user_agent) { "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1" } - it "does not attempt to send any reminders" do - DistributedMutex.expects(:synchronize).never - send_reminder - end - end - - context "when the user agent is for desktop" do - let(:user_agent) { "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36" } - - it "deletes the key in redis" do - send_reminder - expect(described_class.user_has_pending_at_desktop_reminders?(user)).to eq(false) - end - - it "sends a notification to the user and clears the reminder_at" do - send_reminder - expect(Notification.where(user: user, notification_type: Notification.types[:bookmark_reminder]).count).to eq(1) - expect(reminder.reload.reminder_type).to eq(nil) - expect(reminder.reload.reminder_last_sent_at).not_to eq(nil) - expect(reminder.reload.reminder_set_at).to eq(nil) - end - end - end - - context "when there are no pending bookmark at desktop reminders" do - it "does nothing" do - DistributedMutex.expects(:synchronize).never - send_reminder - end - end - - def send_reminder - subject.send_at_desktop_reminder(user: user, request_user_agent: user_agent) - end - end - end diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb index 168887cd47..4196b29d66 100644 --- a/spec/lib/content_security_policy_spec.rb +++ b/spec/lib/content_security_policy_spec.rb @@ -217,9 +217,9 @@ describe ContentSecurityPolicy do policy # call this first to make sure further actions clear the cache theme.set_field(target: :common, name: "header", value: <<~SCRIPT) - + + SCRIPT diff --git a/spec/lib/db_helper_spec.rb b/spec/lib/db_helper_spec.rb index b178cd1e19..c2074a0f80 100644 --- a/spec/lib/db_helper_spec.rb +++ b/spec/lib/db_helper_spec.rb @@ -7,8 +7,6 @@ RSpec.describe DbHelper do it 'should remap columns properly' do post = Fabricate(:post, cooked: "this is a specialcode that I included") post_attributes = post.reload.attributes - post2 = Fabricate(:post, image_url: "/testing/specialcode") - post2_attributes = post2.reload.attributes badge = Fabricate(:badge, query: "specialcode") badge_attributes = badge.reload.attributes @@ -19,13 +17,6 @@ RSpec.describe DbHelper do expect(post.cooked).to include("codespecial") - post2.reload - - expect(post2.image_url).to eq("/testing/codespecial") - - expect(post2_attributes.except("image_url")) - .to eq(post2.attributes.except("image_url")) - badge.reload expect(badge.query).to eq("codespecial") diff --git a/spec/lib/i18n/discourse_i18n_spec.rb b/spec/lib/i18n/discourse_i18n_spec.rb index 0215dc33fe..39c0691d36 100644 --- a/spec/lib/i18n/discourse_i18n_spec.rb +++ b/spec/lib/i18n/discourse_i18n_spec.rb @@ -13,7 +13,6 @@ describe I18n::Backend::DiscourseI18n do backend.store_translations(:en, foo: 'Foo in :en', bar: 'Bar in :en', wat: 'Hello %{count}') backend.store_translations(:en, items: { one: 'one item', other: '%{count} items' }) backend.store_translations(:de, bar: 'Bar in :de') - backend.store_translations(:ru, baz: 'Baz in :ru') backend.store_translations(:en, link: '[text](url)') end @@ -54,13 +53,6 @@ describe I18n::Backend::DiscourseI18n do expect(backend.translate(:de, 'bar')).to eq('Bar in :de') expect(backend.translate(:de, 'foo')).to eq('Foo in :en') end - - it 'uses default_locale as fallback when key exists' do - SiteSetting.default_locale = 'ru' - expect(backend.translate(:de, 'bar')).to eq('Bar in :de') - expect(backend.translate(:de, 'baz')).to eq('Baz in :ru') - expect(backend.translate(:de, 'foo')).to eq('Foo in :en') - end end describe '#exists?' do @@ -75,7 +67,6 @@ describe I18n::Backend::DiscourseI18n do it 'returns true when an existing key and an existing locale is given' do expect(backend.exists?(:en, :foo)).to eq(true) expect(backend.exists?(:de, :bar)).to eq(true) - expect(backend.exists?(:ru, :baz)).to eq(true) end it 'returns false when a non-existing key and an existing locale is given' do diff --git a/spec/lib/i18n/fallback_locale_list_spec.rb b/spec/lib/i18n/fallback_locale_list_spec.rb index 793ac8b2a0..f84a4908aa 100644 --- a/spec/lib/i18n/fallback_locale_list_spec.rb +++ b/spec/lib/i18n/fallback_locale_list_spec.rb @@ -16,7 +16,7 @@ describe I18n::Backend::FallbackLocaleList do it "works when default_locale is English (United States)" do SiteSetting.default_locale = :en_US - expect(list[:ru]).to eq([:ru, :en_US, :en]) + expect(list[:ru]).to eq([:ru, :en]) expect(list[:en_US]).to eq([:en_US, :en]) expect(list[:en]).to eq([:en]) end @@ -24,7 +24,7 @@ describe I18n::Backend::FallbackLocaleList do it "works when default_locale is not English" do SiteSetting.default_locale = :de - expect(list[:ru]).to eq([:ru, :de, :en]) + expect(list[:ru]).to eq([:ru, :en]) expect(list[:de]).to eq([:de, :en]) expect(list[:en]).to eq([:en]) expect(list[:en_US]).to eq([:en_US, :en]) @@ -34,6 +34,7 @@ describe I18n::Backend::FallbackLocaleList do before do DiscoursePluginRegistry.register_locale("es_MX", fallbackLocale: "es") DiscoursePluginRegistry.register_locale("de_AT", fallbackLocale: "de") + DiscoursePluginRegistry.register_locale("de_AT-formal", fallbackLocale: "de_AT") end after do @@ -44,15 +45,27 @@ describe I18n::Backend::FallbackLocaleList do SiteSetting.default_locale = :en expect(list[:de_AT]).to eq([:de_AT, :de, :en]) + expect(list[:"de_AT-formal"]).to eq([:"de_AT-formal", :de_AT, :de, :en]) expect(list[:de]).to eq([:de, :en]) expect(list[:en]).to eq([:en]) end + it "works when default_locale is English (United States)" do + SiteSetting.default_locale = :en_US + + expect(list[:de_AT]).to eq([:de_AT, :de, :en]) + expect(list[:"de_AT-formal"]).to eq([:"de_AT-formal", :de_AT, :de, :en]) + expect(list[:de]).to eq([:de, :en]) + expect(list[:en]).to eq([:en]) + expect(list[:en_US]).to eq([:en_US, :en]) + end + it "works when default_locale is not English" do SiteSetting.default_locale = :de - expect(list[:es_MX]).to eq([:es_MX, :es, :de, :en]) - expect(list[:es]).to eq([:es, :de, :en]) + expect(list[:es_MX]).to eq([:es_MX, :es, :en]) + expect(list[:"de_AT-formal"]).to eq([:"de_AT-formal", :de_AT, :de, :en]) + expect(list[:es]).to eq([:es, :en]) expect(list[:en]).to eq([:en]) end end diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb index 7b81e27306..f8c6faed2d 100644 --- a/spec/lib/search_spec.rb +++ b/spec/lib/search_spec.rb @@ -4,6 +4,20 @@ require 'rails_helper' describe Search do + context "#prepare_data" do + it "does not remove English stop words in mixed mode" do + SiteSetting.search_tokenize_chinese_japanese_korean = true + + tokenized = Search.prepare_data("monkey 吃香蕉 in a loud volume") + expect(tokenized).to eq("monkey 吃 香蕉 in a loud volume") + + SiteSetting.default_locale = 'zh_CN' + + tokenized = Search.prepare_data("monkey 吃香蕉 in a loud volume") + expect(tokenized).to eq("monkey 吃 香蕉 loud") + end + end + context "#ts_config" do it "maps locales to correct Postgres dictionaries" do expect(Search.ts_config).to eq("english") diff --git a/spec/lib/theme_javascript_compiler_spec.rb b/spec/lib/theme_javascript_compiler_spec.rb index ca0c9cd046..e82bb64597 100644 --- a/spec/lib/theme_javascript_compiler_spec.rb +++ b/spec/lib/theme_javascript_compiler_spec.rb @@ -112,19 +112,19 @@ describe ThemeJavascriptCompiler do describe "#append_raw_template" do let(:compiler) { ThemeJavascriptCompiler.new(1, 'marks') } - it 'adds the correct template to "Discourse.RAW_TEMPLATES"' do + it 'uses the correct template paths' do template = "

hello

" name = "/path/to/templates1" compiler.append_raw_template("#{name}.raw", template) - expect(compiler.content.to_s).to include("Discourse.RAW_TEMPLATES[\"#{name}\"]") + expect(compiler.content.to_s).to include("addRawTemplate(\"#{name}\"") name = "/path/to/templates2" compiler.append_raw_template("#{name}.hbr", template) - expect(compiler.content.to_s).to include("Discourse.RAW_TEMPLATES[\"#{name}\"]") + expect(compiler.content.to_s).to include("addRawTemplate(\"#{name}\"") name = "/path/to/templates3" compiler.append_raw_template("#{name}.hbs", template) - expect(compiler.content.to_s).to include("Discourse.RAW_TEMPLATES[\"#{name}.hbs\"]") + expect(compiler.content.to_s).to include("addRawTemplate(\"#{name}.hbs\"") end end end diff --git a/spec/models/application_request_spec.rb b/spec/models/application_request_spec.rb index 794fbbb53a..0531e1c8dd 100644 --- a/spec/models/application_request_spec.rb +++ b/spec/models/application_request_spec.rb @@ -4,11 +4,12 @@ require 'rails_helper' describe ApplicationRequest do before do + ApplicationRequest.enable ApplicationRequest.last_flush = Time.now.utc - Discourse.redis.flushall end after do + ApplicationRequest.disable ApplicationRequest.clear_cache! end @@ -44,7 +45,7 @@ describe ApplicationRequest do end it 'logs nothing for an unflushed increment' do - ApplicationRequest.increment!(:anon) + ApplicationRequest.increment!(:page_view_anon) expect(ApplicationRequest.count).to eq(0) end @@ -90,7 +91,7 @@ describe ApplicationRequest do it 'clears cache correctly' do # otherwise we have test pollution - inc(:anon) + inc(:page_view_anon) ApplicationRequest.clear_cache! ApplicationRequest.write_cache! diff --git a/spec/models/draft_sequence_spec.rb b/spec/models/draft_sequence_spec.rb index 5147f46a7c..47747c15d5 100644 --- a/spec/models/draft_sequence_spec.rb +++ b/spec/models/draft_sequence_spec.rb @@ -5,9 +5,16 @@ require 'rails_helper' describe DraftSequence do fab!(:user) { Fabricate(:user) } - it 'should produce next sequence for a key' do - expect(DraftSequence.next!(user, 'test')).to eq 1 - expect(DraftSequence.next!(user, 'test')).to eq 2 + describe '.next' do + it 'should produce next sequence for a key' do + expect(DraftSequence.next!(user, 'test')).to eq 1 + expect(DraftSequence.next!(user, 'test')).to eq 2 + end + + it 'should not produce next sequence for non-human user' do + user.id = -99999 + 2.times { expect(DraftSequence.next!(user, 'test')).to eq(0) } + end end describe '.current' do @@ -15,6 +22,11 @@ describe DraftSequence do expect(DraftSequence.current(user, 'test')).to eq 0 end + it 'should return nil for non-human user' do + user.id = -99999 + expect(DraftSequence.current(user, 'test')).to eq(0) + end + it 'should return the right sequence' do expect(DraftSequence.next!(user, 'test')).to eq(1) expect(DraftSequence.current(user, 'test')).to eq(1) diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb index 823ab5fab9..980f079599 100644 --- a/spec/models/draft_spec.rb +++ b/spec/models/draft_spec.rb @@ -12,6 +12,22 @@ describe Draft do Fabricate(:post) end + context 'system user' do + it "can not set drafts" do + # fake a sequence + DraftSequence.create!(user_id: Discourse.system_user.id, draft_key: "abc", sequence: 10) + + seq = Draft.set(Discourse.system_user, "abc", 0, { reply: 'hi' }.to_json) + expect(seq).to eq(0) + + draft = Draft.get(Discourse.system_user, "abc", 0) + expect(draft).to eq(nil) + + draft = Draft.get(Discourse.system_user, "abc", 1) + expect(draft).to eq(nil) + end + end + context 'backup_drafts_to_pm_length' do it "correctly backs up drafts to a personal message" do SiteSetting.backup_drafts_to_pm_length = 1 @@ -21,13 +37,13 @@ describe Draft do random_key: "random" } - Draft.set(user, "xyz", 0, draft.to_json) + seq = Draft.set(user, "xyz", 0, draft.to_json) draft["reply"] = "test" * 100 half_grace = (SiteSetting.editing_grace_period / 2 + 1).seconds freeze_time half_grace.from_now - Draft.set(user, "xyz", 0, draft.to_json) + seq = Draft.set(user, "xyz", seq, draft.to_json) draft_post = BackupDraftPost.find_by(user_id: user.id, key: "xyz").post @@ -37,7 +53,7 @@ describe Draft do # this should trigger a post revision as 10 minutes have passed draft["reply"] = "hello" - Draft.set(user, "xyz", 0, draft.to_json) + Draft.set(user, "xyz", seq, draft.to_json) draft_topic = BackupDraftTopic.find_by(user_id: user.id) expect(draft_topic.topic.posts_count).to eq(2) @@ -58,9 +74,16 @@ describe Draft do end it "should overwrite draft data correctly" do - Draft.set(user, "test", 0, "data") - Draft.set(user, "test", 0, "new data") - expect(Draft.get(user, "test", 0)).to eq "new data" + seq = Draft.set(user, "test", 0, "data") + seq = Draft.set(user, "test", seq, "new data") + expect(Draft.get(user, "test", seq)).to eq "new data" + end + + it "should increase the sequence on every save" do + seq = Draft.set(user, "test", 0, "data") + expect(seq).to eq(0) + seq = Draft.set(user, "test", 0, "data") + expect(seq).to eq(1) end it "should clear drafts on request" do @@ -227,7 +250,7 @@ describe Draft do expect(draft_seq).to eq(1) draft_seq = Draft.set(user, 'new_topic', 1, 'hello world', _owner = 'HIJKL') - expect(draft_seq).to eq(1) + expect(draft_seq).to eq(2) end it 'can correctly preload drafts' do diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index 0cb8362c80..42e50cedf4 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -502,6 +502,14 @@ describe Group do expect(user.title).to eq('Different') expect(user.primary_group).to eq(primary_group) end + + it "doesn't fail when the user gets destroyed" do + group.update(title: 'Awesome') + group.add(user) + user.reload + + UserDestroyer.new(Discourse.system_user).destroy(user) + end end it "has custom fields" do @@ -964,24 +972,6 @@ describe Group do end end - it "allows Font Awesome 4.7 syntax as group avatar flair" do - group = Fabricate(:group) - group.flair_url = "fa-air-freshener" - group.save - - group = Group.find(group.id) - expect(group.flair_url).to eq("fa-air-freshener") - end - - it "allows Font Awesome 5 syntax as group avatar flair" do - group = Fabricate(:group) - group.flair_url = "fab fa-bandcamp" - group.save - - group = Group.find(group.id) - expect(group.flair_url).to eq("fab fa-bandcamp") - end - context "Unicode usernames and group names" do before { SiteSetting.unicode_usernames = true } diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb index 9f0a38a836..740bf8e50a 100644 --- a/spec/models/notification_spec.rb +++ b/spec/models/notification_spec.rb @@ -87,6 +87,24 @@ describe Notification do end + describe 'high priority creation' do + fab!(:user) { Fabricate(:user) } + + it "automatically marks the notification as high priority if it is a high priority type" do + notif = Notification.create(user: user, notification_type: Notification.types[:bookmark_reminder], data: {}) + expect(notif.high_priority).to eq(true) + notif = Notification.create(user: user, notification_type: Notification.types[:private_message], data: {}) + expect(notif.high_priority).to eq(true) + notif = Notification.create(user: user, notification_type: Notification.types[:liked], data: {}) + expect(notif.high_priority).to eq(false) + end + + it "allows manually specifying a notification is high priority" do + notif = Notification.create(user: user, notification_type: Notification.types[:liked], data: {}, high_priority: true) + expect(notif.high_priority).to eq(true) + end + end + describe 'unread counts' do fab!(:user) { Fabricate(:user) } diff --git a/spec/models/permalink_spec.rb b/spec/models/permalink_spec.rb index 8cd9d30a46..869d38fba5 100644 --- a/spec/models/permalink_spec.rb +++ b/spec/models/permalink_spec.rb @@ -32,6 +32,7 @@ describe Permalink do let(:topic) { Fabricate(:topic) } let(:post) { Fabricate(:post, topic: topic) } let(:category) { Fabricate(:category) } + let(:tag) { Fabricate(:tag) } subject(:target_url) { permalink.target_url } it "returns a topic url when topic_id is set" do @@ -77,6 +78,24 @@ describe Permalink do expect(target_url).to eq(post.url) end + it "returns a tag url when tag_id is set" do + permalink.tag_id = tag.id + expect(target_url).to eq(tag.full_url) + end + + it "returns nil when tag_id is set but tag is not found" do + permalink.tag_id = 99999 + expect(target_url).to eq(nil) + end + + it "returns a post url when topic_id, post_id, category_id and tag_id are all set for some reason" do + permalink.post_id = post.id + permalink.topic_id = topic.id + permalink.category_id = category.id + permalink.tag_id = tag.id + expect(target_url).to eq(post.url) + end + it "returns nil when nothing is set" do expect(target_url).to eq(nil) end diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index 4cc716d691..5bc5206bce 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -1158,6 +1158,25 @@ describe Post do expect(post.custom_fields).to eq("Tommy" => "Hanks", "Vincent" => "Vega") end + describe "#excerpt_for_topic" do + it "returns a topic excerpt, defaulting to 220 chars" do + expected_excerpt = "This is a sample post with semi-long raw content. The raw content is also more than \ntwo hundred characters to satisfy any test conditions that require content longer \nthan the typical test post raw content. It really is…" + post = Fabricate(:post_with_long_raw_content) + post.rebake! + excerpt = post.excerpt_for_topic + expect(excerpt).to eq(expected_excerpt) + end + + it "respects the site setting for topic excerpt" do + SiteSetting.topic_excerpt_maxlength = 10 + expected_excerpt = "This is a …" + post = Fabricate(:post_with_long_raw_content) + post.rebake! + excerpt = post.excerpt_for_topic + expect(excerpt).to eq(expected_excerpt) + end + end + describe "#rebake!" do it "will rebake a post correctly" do post = create_post @@ -1176,6 +1195,25 @@ describe Post do expect(post.cooked).to eq(first_cooked) expect(result).to eq(true) end + + it "updates the topic excerpt at the same time if it is the OP" do + post = create_post + post.topic.update(excerpt: "test") + DB.exec("UPDATE posts SET cooked = 'frogs' WHERE id = ?", [ post.id ]) + post.reload + result = post.rebake! + post.topic.reload + expect(post.topic.excerpt).not_to eq("test") + end + + it "does not update the topic excerpt if the post is not the OP" do + post = create_post + post2 = create_post + post.topic.update(excerpt: "test") + result = post2.rebake! + post.topic.reload + expect(post.topic.excerpt).to eq("test") + end end describe "#set_owner" do diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb index 7b4dc6dcc1..7ccaf60941 100644 --- a/spec/models/report_spec.rb +++ b/spec/models/report_spec.rb @@ -1173,6 +1173,7 @@ describe Report do context "with data" do it "works" do + ApplicationRequest.enable 3.times { ApplicationRequest.increment!(:page_view_crawler) } 2.times { ApplicationRequest.increment!(:page_view_logged_in) } ApplicationRequest.increment!(:page_view_anon) @@ -1190,6 +1191,9 @@ describe Report do expect(page_view_anon_report[:color]).to eql("#40c8ff") expect(page_view_anon_report[:data][0][:y]).to eql(1) + ensure + ApplicationRequest.disable + ApplicationRequest.clear_cache! end end end diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb index 5fd051fc0c..8d58d6a537 100644 --- a/spec/models/reviewable_spec.rb +++ b/spec/models/reviewable_spec.rb @@ -479,6 +479,33 @@ RSpec.describe Reviewable, type: :model do expect(results.size).to eq(1) expect(results.first).to eq first_reviewable end + + context "when listing for a moderator with a custom filter that joins tables with same named columns" do + it "should not error" do + first_reviewable = Fabricate(:reviewable) + second_reviewable = Fabricate(:reviewable) + custom_filter = [ + :troublemaker, + Proc.new do |results, value| + results.joins(<<~SQL + INNER JOIN posts p ON p.id = target_id + INNER JOIN topics t ON t.id = p.topic_id + INNER JOIN topic_custom_fields tcf ON tcf.topic_id = t.id + INNER JOIN users u ON u.id = tcf.value::integer + SQL + ) + .where(target_type: Post.name) + .where('tcf.name = ?', 'troublemaker_user_id') + .where('u.username = ?', value) + end + ] + + Reviewable.add_custom_filter(custom_filter) + mod = Fabricate(:moderator) + results = Reviewable.list_for(mod, additional_filters: { troublemaker: 'badguy' }) + expect { results.first }.not_to raise_error + end + end end describe '.by_status' do diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb index 441bb734ac..8bf0f7e7fe 100644 --- a/spec/models/tag_spec.rb +++ b/spec/models/tag_spec.rb @@ -36,6 +36,9 @@ describe Tag do expect { Fabricate.build(:tag, name: "hElLo").save! }.to raise_error(ActiveRecord::RecordInvalid) end + it 'does not allow creation of tag with name in "RESERVED_TAGS"' do + expect { Fabricate.build(:tag, name: "None").save! }.to raise_error(ActiveRecord::RecordInvalid) + end end describe 'destroy' do diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb index 306b3aeec3..fcc91536f4 100644 --- a/spec/models/theme_field_spec.rb +++ b/spec/models/theme_field_spec.rb @@ -8,6 +8,10 @@ describe ThemeField do ThemeField.destroy_all end + before do + I18n.locale = :en + end + describe "scope: find_by_theme_ids" do it "returns result in the specified order" do theme = Fabricate(:theme) @@ -60,22 +64,22 @@ describe ThemeField do it 'only extracts inline javascript to an external file' do html = <<~HTML - - - - - - + + + + + + HTML theme_field = ThemeField.create!(theme_id: 1, target_id: 0, name: "header", value: html) @@ -91,13 +95,13 @@ describe ThemeField do it 'adds newlines between the extracted javascripts' do html = <<~HTML - - + + HTML extracted = <<~JavaScript - var a = 10 - var b = 10 + var a = 10 + var b = 10 JavaScript theme_field = ThemeField.create!(theme_id: 1, target_id: 0, name: "header", value: html) @@ -196,14 +200,14 @@ HTML expect(js_field.reload.value_baked).to eq(expected_js.strip) expect(hbs_field.reload.value_baked).to include('Ember.TEMPLATES["discovery"]') - expect(raw_hbs_field.reload.value_baked).to include('Discourse.RAW_TEMPLATES["discovery"]') - expect(hbr_field.reload.value_baked).to include('Discourse.RAW_TEMPLATES["other_discovery"]') + expect(raw_hbs_field.reload.value_baked).to include('addRawTemplate("discovery"') + expect(hbr_field.reload.value_baked).to include('addRawTemplate("other_discovery"') expect(unknown_field.reload.value_baked).to eq("") expect(unknown_field.reload.error).to eq(I18n.t("themes.compile_error.unrecognized_extension", extension: "blah")) # All together expect(theme.javascript_cache.content).to include('Ember.TEMPLATES["discovery"]') - expect(theme.javascript_cache.content).to include('Discourse.RAW_TEMPLATES["discovery"]') + expect(theme.javascript_cache.content).to include('addRawTemplate("discovery"') expect(theme.javascript_cache.content).to include('define("discourse/controllers/discovery"') expect(theme.javascript_cache.content).to include('define("discourse/controllers/discovery-2"') expect(theme.javascript_cache.content).to include("var settings =") @@ -301,8 +305,8 @@ HTML let!(:theme3) { Fabricate(:theme) } let!(:en1) { - ThemeField.create!(theme: theme, target_id: Theme.targets[:translations], name: "en_US", - value: { en_US: { somestring1: "helloworld", group: { key1: "enval1" } } } + ThemeField.create!(theme: theme, target_id: Theme.targets[:translations], name: "en", + value: { en: { somestring1: "helloworld", group: { key1: "enval1" } } } .deep_stringify_keys.to_yaml ) } @@ -313,21 +317,21 @@ HTML ) } let!(:fr2) { ThemeField.create!(theme: theme2, target_id: Theme.targets[:translations], name: "fr", value: "") } - let!(:en2) { ThemeField.create!(theme: theme2, target_id: Theme.targets[:translations], name: "en_US", value: "") } + let!(:en2) { ThemeField.create!(theme: theme2, target_id: Theme.targets[:translations], name: "en", value: "") } let!(:ca3) { ThemeField.create!(theme: theme3, target_id: Theme.targets[:translations], name: "ca", value: "") } - let!(:en3) { ThemeField.create!(theme: theme3, target_id: Theme.targets[:translations], name: "en_US", value: "") } + let!(:en3) { ThemeField.create!(theme: theme3, target_id: Theme.targets[:translations], name: "en", value: "") } describe "scopes" do it "filter_locale_fields returns results in the correct order" do expect(ThemeField.find_by_theme_ids([theme3.id, theme.id, theme2.id]) .filter_locale_fields( - ["en_US", "fr"] + ["en", "fr"] )).to eq([en3, en1, fr1, en2, fr2]) end it "find_first_locale_fields returns only the first locale for each theme" do expect(ThemeField.find_first_locale_fields( - [theme3.id, theme.id, theme2.id], ["ca", "en_US", "fr"] + [theme3.id, theme.id, theme2.id], ["ca", "en", "fr"] )).to eq([ca3, en1, en2]) end end @@ -358,7 +362,7 @@ HTML it "loads correctly" do expect(fr1.translation_data).to eq( fr: { somestring1: "bonjourworld", group: { key2: "frval2" } }, - en_US: { somestring1: "helloworld", group: { key1: "enval1" } } + en: { somestring1: "helloworld", group: { key1: "enval1" } } ) end @@ -380,7 +384,7 @@ HTML theme.reload expect(fr1.translation_data).to eq( fr: { somestring1: "bonjourworld", group: { key2: "frval2" } }, - en_US: { somestring1: "helloworld", group: { key1: "overriddentest1" } } + en: { somestring1: "helloworld", group: { key1: "overriddentest1" } } ) end end @@ -398,9 +402,9 @@ HTML describe "prefix injection" do it "injects into JS" do html = <<~HTML - + HTML theme_field = ThemeField.create!(theme_id: theme.id, target_id: 0, name: "head_tag", value: html) diff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rb index ae162773e3..04b452ccfc 100644 --- a/spec/models/theme_spec.rb +++ b/spec/models/theme_spec.rb @@ -7,6 +7,10 @@ describe Theme do Theme.clear_cache! end + before do + I18n.locale = :en + end + fab! :user do Fabricate(:user) end @@ -657,8 +661,8 @@ HTML end it "can create a hash of overridden values" do - en_translation = ThemeField.create!(theme_id: theme.id, name: "en_US", type_id: ThemeField.types[:yaml], target_id: Theme.targets[:translations], value: <<~YAML) - en_US: + en_translation = ThemeField.create!(theme_id: theme.id, name: "en", type_id: ThemeField.types[:yaml], target_id: Theme.targets[:translations], value: <<~YAML) + en: group_of_translations: translation1: en test1 YAML @@ -668,7 +672,7 @@ HTML theme.update_translation("group_of_translations.translation1", "overriddentest2") theme.reload expect(theme.translation_override_hash).to eq( - "en_US" => { + "en" => { "group_of_translations" => { "translation1" => "overriddentest1" } diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb index c45a2209e1..c91781e6dd 100644 --- a/spec/models/topic_embed_spec.rb +++ b/spec/models/topic_embed_spec.rb @@ -14,7 +14,7 @@ describe TopicEmbed do fab!(:user) { Fabricate(:user) } let(:title) { "How to turn a fish from good to evil in 30 seconds" } let(:url) { 'http://eviltrout.com/123' } - let(:contents) { "hello world new post hello " } + let(:contents) { "

hello world new post hello

" } fab!(:embeddable_host) { Fabricate(:embeddable_host) } it "returns nil when the URL is malformed" do @@ -46,7 +46,7 @@ describe TopicEmbed do it "Supports updating the post content" do expect do - TopicEmbed.import(user, url, "New title received", "muhahaha new contents!") + TopicEmbed.import(user, url, "New title received", "

muhahaha new contents!

") end.to change { topic_embed.reload.content_sha1 } expect(topic_embed.topic.title).to eq("New title received") @@ -308,6 +308,14 @@ describe TopicEmbed do end end + context "non-http URL" do + let(:url) { '/test.txt' } + + it "throws an error" do + expect { TopicEmbed.find_remote(url) }.to raise_error(URI::InvalidURIError) + end + end + context "emails" do let(:url) { 'http://example.com/foo' } let(:contents) { '

URL encoded @ symbol

normal mailto link

' } diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb index 2f8a0bec33..c1a11711a7 100644 --- a/spec/models/topic_link_spec.rb +++ b/spec/models/topic_link_spec.rb @@ -28,31 +28,49 @@ describe TopicLink do end describe 'external links' do - fab!(:post2) do - Fabricate(:post, raw: <<~RAW, user: user, topic: topic) + it 'correctly handles links' do + + non_png = "https://b.com/#{SecureRandom.hex}" + + # prepare a title for one of the links + stub_request(:get, non_png). + with(headers: { + 'Accept' => '*/*', + 'Accept-Encoding' => 'gzip', + 'Host' => 'b.com', + }). + to_return(status: 200, body: "amazing", headers: {}) + + # so we run crawl_topic_links + Jobs.run_immediately! + + png_title = "#{SecureRandom.hex}.png" + png = "https://awesome.com/#{png_title}" + + post = Fabricate(:post, raw: <<~RAW, user: user, topic: topic) http://a.com/ - https://b.com/b + #{non_png} http://#{'a' * 200}.com/invalid //b.com/#{'a' * 500} + #{png} RAW - end - before do - TopicLink.extract_from(post2) - end + TopicLink.extract_from(post) + + # we have a special rule for images title where we pull them out of the filename + expect(topic.topic_links.where(url: png).pluck(:title).first).to eq(png_title) + expect(topic.topic_links.where(url: non_png).pluck(:title).first).to eq("amazing") - it 'works' do expect(topic.topic_links.pluck(:url)).to contain_exactly( + png, + non_png, "http://a.com/", - "https://b.com/b", "//b.com/#{'a' * 500}"[0...TopicLink.max_url_length] ) - end - it "doesn't reset them when rebaking" do old_ids = topic.topic_links.pluck(:id) - TopicLink.extract_from(post2) + TopicLink.extract_from(post) new_ids = topic.topic_links.pluck(:id) @@ -107,15 +125,17 @@ describe TopicLink do # this is subtle, but we had a bug were second time # TopicLink.extract_from was called a reflection was nuked 2.times do - topic.reload TopicLink.extract_from(linked_post) + topic.reload + other_topic.reload + link = topic.topic_links.first expect(link).to be_present expect(link).to be_internal expect(link.url).to eq(url) expect(link.domain).to eq(test_uri.host) - link.link_topic_id == other_topic.id + expect(link.link_topic_id). to eq(other_topic.id) expect(link).not_to be_reflection reflection = other_topic.topic_links.first diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index d381579300..d1d5d1cc91 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -33,7 +33,7 @@ describe Topic do describe 'censored words' do after do - Discourse.redis.flushall + Discourse.redis.flushdb end describe 'when title contains censored words' do diff --git a/spec/models/topic_thumbnail_spec.rb b/spec/models/topic_thumbnail_spec.rb new file mode 100644 index 0000000000..b9e1df75fd --- /dev/null +++ b/spec/models/topic_thumbnail_spec.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true +require 'rails_helper' + +describe "TopicThumbnail" do + let(:upload1) { Fabricate(:image_upload, width: 5000, height: 5000) } + let(:topic) { Fabricate(:topic, image_upload: upload1) } + + before do + SiteSetting.create_thumbnails = true + topic.generate_thumbnails! + + TopicThumbnail.ensure_consistency! + topic.reload + + expect(topic.topic_thumbnails.length).to eq(1) + end + + it "cleans up deleted uploads" do + upload1.delete + + TopicThumbnail.ensure_consistency! + topic.reload + + expect(topic.topic_thumbnails.length).to eq(0) + end + + it "cleans up deleted optimized images" do + upload1.optimized_images.reload.delete_all + + TopicThumbnail.ensure_consistency! + topic.reload + + expect(topic.topic_thumbnails.length).to eq(0) + end + + it "cleans up unneeded sizes" do + expect(topic.topic_thumbnails.length).to eq(1) + topic.topic_thumbnails[0].update_column(:max_width, 999999) + + TopicThumbnail.ensure_consistency! + topic.reload + + expect(topic.topic_thumbnails.length).to eq(0) + end + +end diff --git a/spec/models/translation_override_spec.rb b/spec/models/translation_override_spec.rb index bdb61989bf..8dd4c8eb4a 100644 --- a/spec/models/translation_override_spec.rb +++ b/spec/models/translation_override_spec.rb @@ -92,43 +92,89 @@ describe TranslationOverride do end context "site cache" do - def cached_value(guardian, types_name, name_key, attribute) - json = Site.json_for(guardian) + def cached_value(guardian, translation_key, locale:) + types_name, name_key, attribute = translation_key.split('.') - JSON.parse(json)[types_name] - .find { |x| x['name_key'] == name_key }[attribute] + I18n.with_locale(locale) do + json = Site.json_for(guardian) + + JSON.parse(json)[types_name] + .find { |x| x['name_key'] == name_key }[attribute] + end end + let!(:anon_guardian) { Guardian.new } + let!(:user_guardian) { Guardian.new(Fabricate(:user)) } + shared_examples "resets site text" do it "resets the site cache when translations of post_action_types are changed" do - anon_guardian = Guardian.new - user_guardian = Guardian.new(Fabricate(:user)) - original_value = I18n.t(translation_key) - types_name, name_key, attribute = translation_key.split('.') + I18n.locale = :de - expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq(original_value) - expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq(original_value) + translation_keys.each do |translation_key| + original_value = I18n.t(translation_key, locale: 'en') + expect(cached_value(user_guardian, translation_key, locale: 'en')).to eq(original_value) + expect(cached_value(anon_guardian, translation_key, locale: 'en')).to eq(original_value) - TranslationOverride.upsert!('en', translation_key, 'bar') - expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq('bar') - expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq('bar') + TranslationOverride.upsert!('en', translation_key, 'bar') + expect(cached_value(user_guardian, translation_key, locale: 'en')).to eq('bar') + expect(cached_value(anon_guardian, translation_key, locale: 'en')).to eq('bar') + end - TranslationOverride.revert!('en', translation_key) - expect(cached_value(user_guardian, types_name, name_key, attribute)).to eq(original_value) - expect(cached_value(anon_guardian, types_name, name_key, attribute)).to eq(original_value) + TranslationOverride.revert!('en', translation_keys) + + translation_keys.each do |translation_key| + original_value = I18n.t(translation_key, locale: 'en') + expect(cached_value(user_guardian, translation_key, locale: 'en')).to eq(original_value) + expect(cached_value(anon_guardian, translation_key, locale: 'en')).to eq(original_value) + end end end context "post_action_types" do - let(:translation_key) { 'post_action_types.off_topic.description' } + let(:translation_keys) { ['post_action_types.off_topic.description'] } include_examples "resets site text" end context "topic_flag_types" do - let(:translation_key) { 'topic_flag_types.spam.description' } + let(:translation_keys) { ['topic_flag_types.spam.description'] } include_examples "resets site text" end + + context "multiple keys" do + let(:translation_keys) { ['post_action_types.off_topic.description', 'topic_flag_types.spam.description'] } + + include_examples "resets site text" + end + + describe "#reload_all_overrides!" do + it "correctly reloads all translation overrides" do + original_en_topics = I18n.t("topics", locale: :en) + original_en_emoji = I18n.t("js.composer.emoji", locale: :en) + original_en_offtopic_description = I18n.t("post_action_types.off_topic.description", locale: :en) + original_de_likes = I18n.t("likes", locale: :de) + + TranslationOverride.create!(locale: "en", translation_key: "topics", value: "Threads") + TranslationOverride.create!(locale: "en", translation_key: "js.composer.emoji", value: "Smilies") + TranslationOverride.create!(locale: "en", translation_key: "post_action_types.off_topic.description", value: "Overridden description") + TranslationOverride.create!(locale: "de", translation_key: "likes", value: "„Gefällt mir“-Angaben") + + expect(I18n.t("topics", locale: :en)).to eq(original_en_topics) + expect(I18n.t("js.composer.emoji", locale: :en)).to eq(original_en_emoji) + expect(cached_value(anon_guardian, "post_action_types.off_topic.description", locale: :en)).to eq(original_en_offtopic_description) + expect(I18n.t("likes", locale: :de)).to eq(original_de_likes) + + TranslationOverride.reload_all_overrides! + + expect(I18n.t("topics", locale: :en)).to eq("Threads") + expect(I18n.t("js.composer.emoji", locale: :en)).to eq("Smilies") + expect(cached_value(anon_guardian, "post_action_types.off_topic.description", locale: :en)).to eq("Overridden description") + expect(I18n.t("likes", locale: :de)).to eq("„Gefällt mir“-Angaben") + + TranslationOverride.revert!(:en, ["topics", "js.composer.emoji", "post_action_types.off_topic.description"]) + TranslationOverride.revert!(:de, ["likes"]) + end + end end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index bb27aa4af0..4d2592c788 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -873,6 +873,10 @@ describe User do SiteSetting.previous_visit_timeout_hours = 1 end + after do + reset_last_seen_cache!(user) + end + it "should act correctly" do expect(user.previous_visit_at).to eq(nil) @@ -903,6 +907,10 @@ describe User do let!(:first_visit_date) { Time.zone.now } let!(:second_visit_date) { 2.hours.from_now } + after do + reset_last_seen_cache!(user) + end + it "should update the last seen value" do expect(user.last_seen_at).to eq nil user.update_last_seen!(first_visit_date) @@ -976,7 +984,9 @@ describe User do describe 'with no previous values' do after do - Discourse.redis.flushall + reset_last_seen_cache!(user) + unfreeze_time + reset_last_seen_cache!(user) end it "updates last_seen_at" do @@ -1305,6 +1315,9 @@ describe User do let!(:user) { Fabricate(:user) } let!(:now) { Time.zone.now } before { user.update_last_seen!(now) } + after do + reset_last_seen_cache!(user) + end it "with existing UserVisit record, increments the posts_read value" do expect { @@ -1565,20 +1578,15 @@ describe User do describe '#number_of_rejected_posts' do it 'counts rejected posts' do - post = Fabricate(:post, user: user) - - Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:rejected]) + Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:rejected]) expect(user.number_of_rejected_posts).to eq(1) end it 'ignore non-rejected posts' do - post = Fabricate(:post, user: user) - - Fabricate(:reviewable_queued_post, target: post, status: Reviewable.statuses[:approved]) + Fabricate(:reviewable_queued_post, created_by: user, status: Reviewable.statuses[:approved]) expect(user.number_of_rejected_posts).to eq(0) - end end end @@ -2361,4 +2369,8 @@ describe User do expect(user2.recent_time_read).to eq(50) end end + + def reset_last_seen_cache!(user) + Discourse.redis.del("user:#{user.id}:#{Time.zone.now.to_date}") + end end diff --git a/spec/multisite/s3_store_spec.rb b/spec/multisite/s3_store_spec.rb index 922c5f433b..5681a1df8d 100644 --- a/spec/multisite/s3_store_spec.rb +++ b/spec/multisite/s3_store_spec.rb @@ -217,4 +217,53 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do end end end + + describe "#has_been_uploaded?" do + before do + SiteSetting.s3_region = 'us-west-1' + SiteSetting.s3_upload_bucket = "s3-upload-bucket/test" + SiteSetting.s3_access_key_id = "s3-access-key-id" + SiteSetting.s3_secret_access_key = "s3-secret-access-key" + SiteSetting.enable_s3_uploads = true + end + + let(:store) { FileStore::S3Store.new } + let(:client) { Aws::S3::Client.new(stub_responses: true) } + let(:resource) { Aws::S3::Resource.new(client: client) } + let(:s3_bucket) { resource.bucket(SiteSetting.s3_upload_bucket) } + let(:s3_helper) { store.s3_helper } + + it "returns false for blank urls" do + url = "" + expect(store.has_been_uploaded?(url)).to eq(false) + end + + it "returns true if the base hostname is the same for both urls" do + url = "https://s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png" + expect(store.has_been_uploaded?(url)).to eq(true) + end + + it "returns false if the base hostname is the same for both urls BUT the bucket name is different in the path" do + bucket = "someotherbucket" + url = "https://s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{bucket}/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png" + expect(store.has_been_uploaded?(url)).to eq(false) + end + + it "returns false if the hostnames do not match and the s3_cdn_url is blank" do + url = "https://www.someotherhostname.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png" + expect(store.has_been_uploaded?(url)).to eq(false) + end + + it "returns true if the s3_cdn_url is present and matches the url hostname" do + SiteSetting.s3_cdn_url = "https://www.someotherhostname.com" + url = "https://www.someotherhostname.com/test/original/2X/d/dd7964f5fd13e1103c5244ca30abe1936c0a4b88.png" + expect(store.has_been_uploaded?(url)).to eq(true) + end + + it "returns false if the URI is an invalid mailto link" do + link = 'mailto: roman;@test.com' + + expect(store.has_been_uploaded?(link)).to eq(false) + end + end end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 04a90b3e06..256de29658 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -128,6 +128,12 @@ module TestSetup # code that runs inside jobs. run_later! means they are put on the redis # queue and never processed. Jobs.run_later! + + # Don't track ApplicationRequests in test mode unless opted in + ApplicationRequest.disable + + # Don't queue badge grant in test mode + BadgeGranter.disable_queue end end @@ -188,7 +194,7 @@ RSpec.configure do |config| # Ugly, but needed until we have a user creator User.skip_callback(:create, :after, :ensure_in_trust_level_group) - DiscoursePluginRegistry.clear if ENV['LOAD_PLUGINS'] != "1" + DiscoursePluginRegistry.reset! if ENV['LOAD_PLUGINS'] != "1" Discourse.current_user_provider = TestCurrentUserProvider SiteSetting.refresh! @@ -237,6 +243,12 @@ RSpec.configure do |config| end end + config.after(:suite) do + if SpecSecureRandom.value + FileUtils.remove_dir(file_from_fixtures_tmp_folder, true) + end + end + config.before :each, &TestSetup.method(:test_setup) config.before(:each, type: :multisite) do @@ -368,9 +380,15 @@ def unfreeze_time end def file_from_fixtures(filename, directory = "images") - FileUtils.mkdir_p("#{Rails.root}/tmp/spec") unless Dir.exists?("#{Rails.root}/tmp/spec") - FileUtils.cp("#{Rails.root}/spec/fixtures/#{directory}/#{filename}", "#{Rails.root}/tmp/spec/#{filename}") - File.new("#{Rails.root}/tmp/spec/#{filename}") + SpecSecureRandom.value ||= SecureRandom.hex + FileUtils.mkdir_p(file_from_fixtures_tmp_folder) unless Dir.exists?(file_from_fixtures_tmp_folder) + tmp_file_path = File.join(file_from_fixtures_tmp_folder, SecureRandom.hex << filename) + FileUtils.cp("#{Rails.root}/spec/fixtures/#{directory}/#{filename}", tmp_file_path) + File.new(tmp_file_path) +end + +def file_from_fixtures_tmp_folder + File.join(Dir.tmpdir, "rspec_#{Process.pid}_#{SpecSecureRandom.value}") end def has_trigger?(trigger_name) @@ -410,3 +428,9 @@ def track_log_messages(level: nil) ensure Rails.logger = old_logger end + +class SpecSecureRandom + class << self + attr_accessor :value + end +end diff --git a/spec/requests/about_controller_spec.rb b/spec/requests/about_controller_spec.rb index 6c58284979..a10b766304 100644 --- a/spec/requests/about_controller_spec.rb +++ b/spec/requests/about_controller_spec.rb @@ -36,5 +36,21 @@ describe AboutController do expect(response.body).to include("About - Discourse") end end + + it "serializes stats when 'Guardian#can_see_about_stats?' is true" do + Guardian.any_instance.stubs(:can_see_about_stats?).returns(true) + get "/about.json" + + expect(response.status).to eq(200) + expect(response.parsed_body["about"].keys).to include("stats") + end + + it "does not serialize stats when 'Guardian#can_see_about_stats?' is false" do + Guardian.any_instance.stubs(:can_see_about_stats?).returns(false) + get "/about.json" + + expect(response.status).to eq(200) + expect(response.parsed_body["about"].keys).not_to include("stats") + end end end diff --git a/spec/requests/admin/api_controller_spec.rb b/spec/requests/admin/api_controller_spec.rb index 9c48d74732..029801dbcf 100644 --- a/spec/requests/admin/api_controller_spec.rb +++ b/spec/requests/admin/api_controller_spec.rb @@ -22,7 +22,7 @@ describe Admin::ApiController do it "succeeds" do get "/admin/api/keys.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body)["keys"].length).to eq(2) + expect(response.parsed_body["keys"].length).to eq(2) end end @@ -30,7 +30,7 @@ describe Admin::ApiController do it "succeeds" do get "/admin/api/keys/#{key1.id}.json" expect(response.status).to eq(200) - data = JSON.parse(response.body)["key"] + data = response.parsed_body["key"] expect(data["id"]).to eq(key1.id) expect(data["key"]).to eq(nil) expect(data["truncated_key"]).to eq(key1.key[0..3]) @@ -92,7 +92,7 @@ describe Admin::ApiController do } expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data['key']['description']).to eq("master key description") expect(data['key']['user']).to eq(nil) @@ -117,7 +117,7 @@ describe Admin::ApiController do } expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data['key']['description']).to eq("restricted key description") expect(data['key']['user']['username']).to eq(user.username) diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb index 406898e028..03b9245744 100644 --- a/spec/requests/admin/backups_controller_spec.rb +++ b/spec/requests/admin/backups_controller_spec.rb @@ -35,7 +35,7 @@ RSpec.describe Admin::BackupsController do end after do - Discourse.redis.flushall + Discourse.redis.flushdb @paths&.each { |path| File.delete(path) if File.exists?(path) } @paths = nil @@ -67,7 +67,7 @@ RSpec.describe Admin::BackupsController do get "/admin/backups.json" expect(response.status).to eq(200) - filenames = JSON.parse(response.body).map { |backup| backup["filename"] } + filenames = response.parsed_body.map { |backup| backup["filename"] } expect(filenames).to include(backup_filename) expect(filenames).to include(backup_filename2) end diff --git a/spec/requests/admin/badges_controller_spec.rb b/spec/requests/admin/badges_controller_spec.rb index f54875a21a..185143e4f9 100644 --- a/spec/requests/admin/badges_controller_spec.rb +++ b/spec/requests/admin/badges_controller_spec.rb @@ -27,7 +27,7 @@ describe Admin::BadgesController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)["grant_count"]).to be > 0 + expect(response.parsed_body["grant_count"]).to be > 0 end it 'does not allow anything if enable_badge_sql is disabled' do @@ -49,7 +49,7 @@ describe Admin::BadgesController do name: 'test', query: 'select 1 as user_id, null as granted_at', badge_type_id: 1 } - json = JSON.parse(response.body) + json = response.parsed_body expect(response.status).to eq(200) expect(json["badge"]["name"]).to eq('test') expect(json["badge"]["query"]).to eq('select 1 as user_id, null as granted_at') @@ -76,7 +76,7 @@ describe Admin::BadgesController do expect(groupings2.map { |g| g.name }).to eq(names) expect((groupings.map(&:id) - groupings2.map { |g| g.id }).compact).to be_blank - expect(::JSON.parse(response.body)["badge_groupings"].length).to eq(groupings2.length) + expect(response.parsed_body["badge_groupings"].length).to eq(groupings2.length) end end @@ -85,7 +85,7 @@ describe Admin::BadgesController do get "/admin/badges/types.json" expect(response.status).to eq(200) - expect(::JSON.parse(response.body)["badge_types"]).to be_present + expect(response.parsed_body["badge_types"]).to be_present end end diff --git a/spec/requests/admin/color_schemes_controller_spec.rb b/spec/requests/admin/color_schemes_controller_spec.rb index 8cf4e20fc1..782d9ee5c2 100644 --- a/spec/requests/admin/color_schemes_controller_spec.rb +++ b/spec/requests/admin/color_schemes_controller_spec.rb @@ -28,7 +28,7 @@ describe Admin::ColorSchemesController do get "/admin/color_schemes.json" expect(response.status).to eq(200) - schemes = JSON.parse(response.body).map { |scheme| scheme["name"] } + schemes = response.parsed_body.map { |scheme| scheme["name"] } expect(schemes).to include(scheme_name) end end @@ -38,7 +38,7 @@ describe Admin::ColorSchemesController do post "/admin/color_schemes.json", params: valid_params expect(response.status).to eq(200) - expect(::JSON.parse(response.body)['id']).to be_present + expect(response.parsed_body['id']).to be_present end it "returns failure with invalid params" do @@ -48,7 +48,7 @@ describe Admin::ColorSchemesController do post "/admin/color_schemes.json", params: valid_params expect(response.status).to eq(422) - expect(::JSON.parse(response.body)['errors']).to be_present + expect(response.parsed_body['errors']).to be_present end end @@ -77,7 +77,7 @@ describe Admin::ColorSchemesController do put "/admin/color_schemes/#{color_scheme.id}.json", params: params expect(response.status).to eq(422) - expect(::JSON.parse(response.body)['errors']).to be_present + expect(response.parsed_body['errors']).to be_present end end diff --git a/spec/requests/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rb index 22b5a36829..46602ae91d 100644 --- a/spec/requests/admin/dashboard_controller_spec.rb +++ b/spec/requests/admin/dashboard_controller_spec.rb @@ -29,7 +29,7 @@ describe Admin::DashboardController do get "/admin/dashboard.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body)['version_check']).to be_present + expect(response.parsed_body['version_check']).to be_present end end @@ -41,7 +41,7 @@ describe Admin::DashboardController do it 'does not return discourse version info' do get "/admin/dashboard.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['version_check']).not_to be_present end end @@ -57,7 +57,7 @@ describe Admin::DashboardController do get "/admin/dashboard/problems.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['problems'].size).to eq(0) end end @@ -70,7 +70,7 @@ describe Admin::DashboardController do it 'returns an array of strings' do get "/admin/dashboard/problems.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['problems'].size).to eq(2) expect(json['problems'][0]).to be_a(String) expect(json['problems'][1]).to be_a(String) diff --git a/spec/requests/admin/email_controller_spec.rb b/spec/requests/admin/email_controller_spec.rb index eb632bcbe1..eb6d23fd06 100644 --- a/spec/requests/admin/email_controller_spec.rb +++ b/spec/requests/admin/email_controller_spec.rb @@ -26,7 +26,7 @@ describe Admin::EmailController do it 'does not include the password in the response' do get "/admin/email.json" - mail_settings = JSON.parse(response.body)['settings'] + mail_settings = response.parsed_body['settings'] expect( mail_settings.select { |setting| setting['name'] == 'password' } @@ -47,7 +47,7 @@ describe Admin::EmailController do get "/admin/email/sent.json" expect(response.status).to eq(200) - log = JSON.parse(response.body).first + log = response.parsed_body.first expect(log["id"]).to eq(email_log.id) expect(log["reply_key"]).to eq(nil) @@ -56,7 +56,7 @@ describe Admin::EmailController do get "/admin/email/sent.json" expect(response.status).to eq(200) - log = JSON.parse(response.body).first + log = response.parsed_body.first expect(log["id"]).to eq(email_log.id) expect(log["reply_key"]).to eq(post_reply_key.reply_key) end @@ -80,7 +80,7 @@ describe Admin::EmailController do expect(response.status).to eq(200) - logs = JSON.parse(response.body) + logs = response.parsed_body expect(logs.size).to eq(1) expect(logs.first["reply_key"]).to eq(post_reply_key_2.reply_key) @@ -98,7 +98,7 @@ describe Admin::EmailController do expect(response.status).to eq(200) - logs = JSON.parse(response.body) + logs = response.parsed_body expect(logs.first["id"]).to eq(log2.id) expect(logs.last["id"]).to eq(log1.id) @@ -112,7 +112,7 @@ describe Admin::EmailController do expect(response.status).to eq(200) - logs = JSON.parse(response.body) + logs = response.parsed_body expect(logs.count).to eq(1) expect(logs.first["id"]).to eq(log1.id) @@ -147,7 +147,7 @@ describe Admin::EmailController do admin.email ) - incoming = JSON.parse(response.body) + incoming = response.parsed_body expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test")) end @@ -160,7 +160,7 @@ describe Admin::EmailController do eviltrout.email ) - incoming = JSON.parse(response.body) + incoming = response.parsed_body expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test")) end @@ -173,7 +173,7 @@ describe Admin::EmailController do eviltrout.email ) - incoming = JSON.parse(response.body) + incoming = response.parsed_body expect(incoming['sent_test_email_message']).to eq(I18n.t("admin.email.sent_test")) end end @@ -214,7 +214,7 @@ describe Admin::EmailController do Fabricate(:incoming_email, error: "") get "/admin/email/rejected.json" expect(response.status).to eq(200) - rejected = JSON.parse(response.body) + rejected = response.parsed_body expect(rejected.first['error']).to eq(I18n.t("emails.incoming.unrecognized_error")) end end @@ -224,7 +224,7 @@ describe Admin::EmailController do incoming_email = Fabricate(:incoming_email, error: "") get "/admin/email/incoming/#{incoming_email.id}.json" expect(response.status).to eq(200) - incoming = JSON.parse(response.body) + incoming = response.parsed_body expect(incoming['error']).to eq(I18n.t("emails.incoming.unrecognized_error")) end end @@ -234,7 +234,7 @@ describe Admin::EmailController do get "/admin/email/incoming_from_bounced/12345.json" expect(response.status).to eq(404) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["errors"]).to include("Discourse::InvalidParameters") end @@ -242,7 +242,7 @@ describe Admin::EmailController do get "/admin/email/incoming_from_bounced/#{email_log.id}.json" expect(response.status).to eq(404) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["errors"]).to include("Discourse::InvalidParameters") end @@ -262,7 +262,7 @@ describe Admin::EmailController do get "/admin/email/incoming_from_bounced/#{email_log.id}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["error"]).to eq(error_message) end @@ -276,7 +276,7 @@ describe Admin::EmailController do get "/admin/email/incoming_from_bounced/#{email_log.id}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["error"]).to eq(error_message) end @@ -286,7 +286,7 @@ describe Admin::EmailController do get "/admin/email/incoming_from_bounced/#{email_log.id}.json" expect(response.status).to eq(404) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["errors"]).to include("Discourse::InvalidParameters") end @@ -294,7 +294,7 @@ describe Admin::EmailController do get "/admin/email/incoming_from_bounced/#{email_log.id}.json" expect(response.status).to eq(404) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["errors"]).to include("Discourse::NotFound") end end @@ -317,7 +317,7 @@ describe Admin::EmailController do EMAIL post "/admin/email/advanced-test.json", params: { email: email } expect(response.status).to eq(200) - incoming = JSON.parse(response.body) + incoming = response.parsed_body expect(incoming['format']).to eq(1) expect(incoming['text']).to eq("Hello, this is a test!") expect(incoming['elided']).to eq("---\n\nThis part should be elided.") diff --git a/spec/requests/admin/email_styles_controller_spec.rb b/spec/requests/admin/email_styles_controller_spec.rb index 9d1f297e7e..0884503dc6 100644 --- a/spec/requests/admin/email_styles_controller_spec.rb +++ b/spec/requests/admin/email_styles_controller_spec.rb @@ -21,7 +21,7 @@ describe Admin::EmailStylesController do get '/admin/customize/email_style.json' expect(response.status).to eq(200) - json = ::JSON.parse(response.body)['email_style'] + json = response.parsed_body['email_style'] expect(json['html']).to eq(default_html) expect(json['css']).to eq(default_css) end @@ -32,7 +32,7 @@ describe Admin::EmailStylesController do get '/admin/customize/email_style.json' expect(response.status).to eq(200) - json = ::JSON.parse(response.body)['email_style'] + json = response.parsed_body['email_style'] expect(json['html']).to eq("For you: %{email_content}") expect(json['css']).to eq(".user-name { font-size: 24px; }") end @@ -59,7 +59,7 @@ describe Admin::EmailStylesController do email_style: valid_params.merge(html: 'No email content') } expect(response.status).to eq(422) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['errors']).to include( I18n.t( 'email_style.html_missing_placeholder', diff --git a/spec/requests/admin/email_templates_controller_spec.rb b/spec/requests/admin/email_templates_controller_spec.rb index 9b98d4880a..1de916a36f 100644 --- a/spec/requests/admin/email_templates_controller_spec.rb +++ b/spec/requests/admin/email_templates_controller_spec.rb @@ -37,7 +37,7 @@ RSpec.describe Admin::EmailTemplatesController do expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['email_templates']).to be_present end @@ -51,7 +51,7 @@ RSpec.describe Admin::EmailTemplatesController do get '/admin/customize/email_templates.json' expect(response.status).to eq(200) - templates = JSON.parse(response.body)['email_templates'] + templates = response.parsed_body['email_templates'] template = templates.find { |t| t['id'] == 'user_notifications.admin_login' } expect(template['can_revert']).to eq(true) @@ -59,7 +59,7 @@ RSpec.describe Admin::EmailTemplatesController do get '/admin/customize/email_templates.json' expect(response.status).to eq(200) - templates = JSON.parse(response.body)['email_templates'] + templates = response.parsed_body['email_templates'] template = templates.find { |t| t['id'] == 'user_notifications.admin_login' } expect(template['can_revert']).to eq(false) end @@ -93,7 +93,7 @@ RSpec.describe Admin::EmailTemplatesController do expect(response).not_to be_successful - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['error_type']).to eq('not_found') end @@ -103,7 +103,7 @@ RSpec.describe Admin::EmailTemplatesController do email_template: { subject: email_subject, body: email_body } }, headers: headers - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json).to be_present errors = json['errors'] @@ -196,7 +196,7 @@ RSpec.describe Admin::EmailTemplatesController do expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json).to be_present template = json['email_template'] @@ -279,7 +279,7 @@ RSpec.describe Admin::EmailTemplatesController do delete '/admin/customize/email_templates/non_existent_template', headers: headers expect(response).not_to be_successful - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['error_type']).to eq('not_found') end @@ -307,7 +307,7 @@ RSpec.describe Admin::EmailTemplatesController do delete '/admin/customize/email_templates/user_notifications.admin_login', headers: headers expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json).to be_present template = json['email_template'] diff --git a/spec/requests/admin/emojis_controller_spec.rb b/spec/requests/admin/emojis_controller_spec.rb index 5ab52b3447..39078a2fc4 100644 --- a/spec/requests/admin/emojis_controller_spec.rb +++ b/spec/requests/admin/emojis_controller_spec.rb @@ -18,7 +18,7 @@ RSpec.describe Admin::EmojisController do get "/admin/customize/emojis.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json[0]["name"]).to eq("osama-test-emoji") expect(json[0]["url"]).to eq(upload.url) end @@ -34,7 +34,7 @@ RSpec.describe Admin::EmojisController do } expect(response.status).to eq(422) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["errors"]).to eq([I18n.t('upload.images.size_not_found')]) end end @@ -49,7 +49,7 @@ RSpec.describe Admin::EmojisController do } expect(response.status).to eq(422) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["errors"]).to eq([ "Name #{I18n.t('activerecord.errors.models.custom_emoji.attributes.name.taken')}" ]) @@ -69,7 +69,7 @@ RSpec.describe Admin::EmojisController do expect(upload.original_filename).to eq('logo.png') - data = JSON.parse(response.body) + data = response.parsed_body expect(response.status).to eq(200) expect(data["errors"]).to eq(nil) expect(data["name"]).to eq(custom_emoji.name) @@ -88,7 +88,7 @@ RSpec.describe Admin::EmojisController do custom_emoji = CustomEmoji.last - data = JSON.parse(response.body) + data = response.parsed_body expect(response.status).to eq(200) expect(custom_emoji.group).to eq("foo") end diff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rb index 7ddc1562fe..c8cedd06ba 100644 --- a/spec/requests/admin/groups_controller_spec.rb +++ b/spec/requests/admin/groups_controller_spec.rb @@ -46,7 +46,7 @@ RSpec.describe Admin::GroupsController do end after do - Group.plugin_editable_group_custom_fields.clear + DiscoursePluginRegistry.reset! end it "only updates allowed user fields" do @@ -63,7 +63,7 @@ RSpec.describe Admin::GroupsController do end it "is secure when there are no registered editable fields" do - Group.plugin_editable_group_custom_fields.clear + DiscoursePluginRegistry.reset! params = group_params params[:group].merge!(custom_fields: { test: :hello1, test2: :hello2 }) @@ -88,7 +88,7 @@ RSpec.describe Admin::GroupsController do expect(response.status).to eq(200) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body["usernames"]).to contain_exactly(user.username, admin.username) @@ -190,7 +190,7 @@ RSpec.describe Admin::GroupsController do expect(user2.title).to eq("WAT") expect(user2.trust_level).to eq(4) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['message']).to eq("2 users have been added to the group.") expect(json['users_not_added'][0]).to eq("doesnt_exist") end @@ -223,4 +223,31 @@ RSpec.describe Admin::GroupsController do end end end + + describe '#automatic_membership_count' do + it 'returns count of users whose emails match the domain' do + Fabricate(:user, email: 'user1@somedomain.org') + Fabricate(:user, email: 'user1@somedomain.com') + Fabricate(:user, email: 'user1@notsomedomain.com') + group = Fabricate(:group) + + put "/admin/groups/automatic_membership_count.json", params: { + automatic_membership_email_domains: 'somedomain.org|somedomain.com', + id: group.id + } + expect(response.status).to eq(200) + expect(response.parsed_body["user_count"]).to eq(2) + end + + it "doesn't responde with 500 if domain is invalid" do + group = Fabricate(:group) + + put "/admin/groups/automatic_membership_count.json", params: { + automatic_membership_email_domains: '@somedomain.org|@somedomain.com', + id: group.id + } + expect(response.status).to eq(200) + expect(response.parsed_body["user_count"]).to eq(0) + end + end end diff --git a/spec/requests/admin/permalinks_controller_spec.rb b/spec/requests/admin/permalinks_controller_spec.rb index 80df731909..ad3344b27a 100644 --- a/spec/requests/admin/permalinks_controller_spec.rb +++ b/spec/requests/admin/permalinks_controller_spec.rb @@ -24,7 +24,7 @@ describe Admin::PermalinksController do get "/admin/permalinks.json", params: { filter: "topic" } expect(response.status).to eq(200) - result = JSON.parse(response.body) + result = response.parsed_body expect(result.length).to eq(2) end @@ -37,7 +37,7 @@ describe Admin::PermalinksController do get "/admin/permalinks.json", params: { filter: "discourse" } expect(response.status).to eq(200) - result = JSON.parse(response.body) + result = response.parsed_body expect(result.length).to eq(2) end @@ -50,8 +50,62 @@ describe Admin::PermalinksController do get "/admin/permalinks.json", params: { filter: "discourse" } expect(response.status).to eq(200) - result = JSON.parse(response.body) + result = response.parsed_body expect(result.length).to eq(3) end end + + describe "#create" do + it "works for topics" do + topic = Fabricate(:topic) + + post "/admin/permalinks.json", params: { + url: "/topics/771", + permalink_type: "topic_id", + permalink_type_value: topic.id + } + + expect(response.status).to eq(200) + expect(Permalink.last).to have_attributes(url: "topics/771", topic_id: topic.id, post_id: nil, category_id: nil, tag_id: nil) + end + + it "works for posts" do + some_post = Fabricate(:post) + + post "/admin/permalinks.json", params: { + url: "/topics/771/8291", + permalink_type: "post_id", + permalink_type_value: some_post.id + } + + expect(response.status).to eq(200) + expect(Permalink.last).to have_attributes(url: "topics/771/8291", topic_id: nil, post_id: some_post.id, category_id: nil, tag_id: nil) + end + + it "works for categories" do + category = Fabricate(:category) + + post "/admin/permalinks.json", params: { + url: "/forums/11", + permalink_type: "category_id", + permalink_type_value: category.id + } + + expect(response.status).to eq(200) + expect(Permalink.last).to have_attributes(url: "forums/11", topic_id: nil, post_id: nil, category_id: category.id, tag_id: nil) + end + + it "works for tags" do + tag = Fabricate(:tag) + + post "/admin/permalinks.json", params: { + url: "/forums/12", + permalink_type: "tag_name", + permalink_type_value: tag.name + } + + expect(response.status).to eq(200) + expect(Permalink.last).to have_attributes(url: "forums/12", topic_id: nil, post_id: nil, category_id: nil, tag_id: tag.id) + end + end end diff --git a/spec/requests/admin/plugins_controller_spec.rb b/spec/requests/admin/plugins_controller_spec.rb index 75b1b5f21e..463fb321b7 100644 --- a/spec/requests/admin/plugins_controller_spec.rb +++ b/spec/requests/admin/plugins_controller_spec.rb @@ -16,7 +16,7 @@ describe Admin::PluginsController do it 'should return JSON' do get "/admin/plugins.json" expect(response.status).to eq(200) - expect(::JSON.parse(response.body).has_key?('plugins')).to eq(true) + expect(response.parsed_body.has_key?('plugins')).to eq(true) end end end diff --git a/spec/requests/admin/reports_controller_spec.rb b/spec/requests/admin/reports_controller_spec.rb index 1f3208746e..1138b1be6f 100644 --- a/spec/requests/admin/reports_controller_spec.rb +++ b/spec/requests/admin/reports_controller_spec.rb @@ -27,7 +27,7 @@ describe Admin::ReportsController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)["reports"].count).to eq(2) + expect(response.parsed_body["reports"].count).to eq(2) end end @@ -42,9 +42,9 @@ describe Admin::ReportsController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)["reports"].count).to eq(2) - expect(JSON.parse(response.body)["reports"][0]["type"]).to eq("topics") - expect(JSON.parse(response.body)["reports"][1]["type"]).to eq("not_found") + expect(response.parsed_body["reports"].count).to eq(2) + expect(response.parsed_body["reports"][0]["type"]).to eq("topics") + expect(response.parsed_body["reports"][1]["type"]).to eq("not_found") end end @@ -92,7 +92,7 @@ describe Admin::ReportsController do get "/admin/reports/topics.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body)["report"]["total"]).to eq(1) + expect(response.parsed_body["report"]["total"]).to eq(1) end end end @@ -107,7 +107,7 @@ describe Admin::ReportsController do expect(response.status).to eq(200) - report = JSON.parse(response.body)["report"] + report = response.parsed_body["report"] expect(report["type"]).to eq('topics') expect(report["data"].count).to eq(1) @@ -126,7 +126,7 @@ describe Admin::ReportsController do expect(response.status).to eq(200) - report = JSON.parse(response.body)["report"] + report = response.parsed_body["report"] expect(report["type"]).to eq('signups') expect(report["data"].count).to eq(1) diff --git a/spec/requests/admin/robots_txt_controller_spec.rb b/spec/requests/admin/robots_txt_controller_spec.rb index 046914017a..e23e0b8d38 100644 --- a/spec/requests/admin/robots_txt_controller_spec.rb +++ b/spec/requests/admin/robots_txt_controller_spec.rb @@ -38,7 +38,7 @@ describe Admin::RobotsTxtController do it "returns default content if there are no overrides" do get "/admin/customize/robots.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["robots_txt"]).to be_present expect(json["overridden"]).to eq(false) end @@ -47,7 +47,7 @@ describe Admin::RobotsTxtController do SiteSetting.overridden_robots_txt = "something" get "/admin/customize/robots.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["robots_txt"]).to eq("something") expect(json["overridden"]).to eq(true) end @@ -59,7 +59,7 @@ describe Admin::RobotsTxtController do it "overrides the site's default robots.txt" do put "/admin/customize/robots.json", params: { robots_txt: "new_content" } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["robots_txt"]).to eq("new_content") expect(json["overridden"]).to eq(true) expect(SiteSetting.overridden_robots_txt).to eq("new_content") @@ -82,7 +82,7 @@ describe Admin::RobotsTxtController do SiteSetting.overridden_robots_txt = "overridden_content" delete "/admin/customize/robots.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["robots_txt"]).not_to include("overridden_content") expect(json["overridden"]).to eq(false) expect(SiteSetting.overridden_robots_txt).to eq("") diff --git a/spec/requests/admin/screened_emails_controller_spec.rb b/spec/requests/admin/screened_emails_controller_spec.rb index e1e3b41ebb..50ae5a22e0 100644 --- a/spec/requests/admin/screened_emails_controller_spec.rb +++ b/spec/requests/admin/screened_emails_controller_spec.rb @@ -16,7 +16,7 @@ describe Admin::ScreenedEmailsController do Fabricate(:screened_email) get "/admin/logs/screened_emails.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json.size).to eq(1) end end diff --git a/spec/requests/admin/screened_ip_addresses_controller_spec.rb b/spec/requests/admin/screened_ip_addresses_controller_spec.rb index 8bfd1b8d1f..c4ae9927ef 100644 --- a/spec/requests/admin/screened_ip_addresses_controller_spec.rb +++ b/spec/requests/admin/screened_ip_addresses_controller_spec.rb @@ -24,13 +24,13 @@ describe Admin::ScreenedIpAddressesController do get "/admin/logs/screened_ip_addresses.json", params: { filter: "1.2.*" } expect(response.status).to eq(200) - result = JSON.parse(response.body) + result = response.parsed_body expect(result.length).to eq(3) get "/admin/logs/screened_ip_addresses.json", params: { filter: "4.5.6.7" } expect(response.status).to eq(200) - result = JSON.parse(response.body) + result = response.parsed_body expect(result.length).to eq(1) end end diff --git a/spec/requests/admin/screened_urls_controller_spec.rb b/spec/requests/admin/screened_urls_controller_spec.rb index 32af969c6f..55027ec6bb 100644 --- a/spec/requests/admin/screened_urls_controller_spec.rb +++ b/spec/requests/admin/screened_urls_controller_spec.rb @@ -16,7 +16,7 @@ describe Admin::ScreenedUrlsController do Fabricate(:screened_url) get "/admin/logs/screened_urls.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json.size).to eq(1) end end diff --git a/spec/requests/admin/search_logs_spec.rb b/spec/requests/admin/search_logs_spec.rb index bca3d030aa..6ac294380e 100644 --- a/spec/requests/admin/search_logs_spec.rb +++ b/spec/requests/admin/search_logs_spec.rb @@ -32,7 +32,7 @@ RSpec.describe Admin::SearchLogsController do expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json[0]['term']).to eq('ruby') expect(json[0]['searches']).to eq(1) expect(json[0]['ctr']).to eq(0) @@ -67,7 +67,7 @@ RSpec.describe Admin::SearchLogsController do expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['term']['type']).to eq('search_log_term') expect(json['term']['search_result']).to be_present end diff --git a/spec/requests/admin/site_settings_controller_spec.rb b/spec/requests/admin/site_settings_controller_spec.rb index 5dc564e701..7962ab295d 100644 --- a/spec/requests/admin/site_settings_controller_spec.rb +++ b/spec/requests/admin/site_settings_controller_spec.rb @@ -19,7 +19,7 @@ describe Admin::SiteSettingsController do it 'returns valid info' do get "/admin/site_settings.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["site_settings"].length).to be > 100 locale = json["site_settings"].select do |s| @@ -183,7 +183,7 @@ describe Admin::SiteSettingsController do default_categories_watching: category_id } - expect(JSON.parse(response.body)["user_count"]).to eq(User.count) + expect(response.parsed_body["user_count"]).to eq(User.count) CategoryUser.create!(category_id: category_id, notification_level: tracking, user: user) @@ -191,7 +191,7 @@ describe Admin::SiteSettingsController do default_categories_watching: category_id } - expect(JSON.parse(response.body)["user_count"]).to eq(User.count - 1) + expect(response.parsed_body["user_count"]).to eq(User.count - 1) SiteSetting.setting(:default_categories_watching, "") end @@ -203,7 +203,7 @@ describe Admin::SiteSettingsController do default_tags_watching: tag.name } - expect(JSON.parse(response.body)["user_count"]).to eq(User.count) + expect(response.parsed_body["user_count"]).to eq(User.count) TagUser.create!(tag_id: tag.id, notification_level: tracking, user: user) @@ -211,7 +211,7 @@ describe Admin::SiteSettingsController do default_tags_watching: tag.name } - expect(JSON.parse(response.body)["user_count"]).to eq(User.count - 1) + expect(response.parsed_body["user_count"]).to eq(User.count - 1) SiteSetting.setting(:default_tags_watching, "") end diff --git a/spec/requests/admin/site_texts_controller_spec.rb b/spec/requests/admin/site_texts_controller_spec.rb index 6606b4446f..aea6653e36 100644 --- a/spec/requests/admin/site_texts_controller_spec.rb +++ b/spec/requests/admin/site_texts_controller_spec.rb @@ -48,35 +48,35 @@ RSpec.describe Admin::SiteTextsController do it 'returns json' do get "/admin/customize/site_texts.json", params: { q: 'title' } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['site_texts']).to include(include("id" => "title")) + expect(response.parsed_body['site_texts']).to include(include("id" => "title")) end it 'sets has_more to true if more than 50 results were found' do get "/admin/customize/site_texts.json", params: { q: 'e' } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['site_texts'].size).to eq(50) - expect(JSON.parse(response.body)['extras']['has_more']).to be_truthy + expect(response.parsed_body['site_texts'].size).to eq(50) + expect(response.parsed_body['extras']['has_more']).to be_truthy end it 'works with pages' do texts = Set.new get "/admin/customize/site_texts.json", params: { q: 'e' } - JSON.parse(response.body)['site_texts'].each { |text| texts << text['id'] } + response.parsed_body['site_texts'].each { |text| texts << text['id'] } expect(texts.size).to eq(50) get "/admin/customize/site_texts.json", params: { q: 'e', page: 1 } - JSON.parse(response.body)['site_texts'].each { |text| texts << text['id'] } + response.parsed_body['site_texts'].each { |text| texts << text['id'] } expect(texts.size).to eq(100) end it 'works with locales' do get "/admin/customize/site_texts.json", params: { q: 'yes_value', locale: 'en' } - value = JSON.parse(response.body)['site_texts'].find { |text| text['id'] == 'js.yes_value' }['value'] + value = response.parsed_body['site_texts'].find { |text| text['id'] == 'js.yes_value' }['value'] expect(value).to eq(I18n.with_locale(:en) { I18n.t('js.yes_value') }) get "/admin/customize/site_texts.json", params: { q: 'yes_value', locale: 'de' } - value = JSON.parse(response.body)['site_texts'].find { |text| text['id'] == 'js.yes_value' }['value'] + value = response.parsed_body['site_texts'].find { |text| text['id'] == 'js.yes_value' }['value'] expect(value).to eq(I18n.with_locale(:de) { I18n.t('js.yes_value') }) end @@ -99,7 +99,7 @@ RSpec.describe Admin::SiteTextsController do ].each do |search_term| get "/admin/customize/site_texts.json", params: { q: search_term } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['site_texts']).to include(include("id" => "title", "value" => value)) + expect(response.parsed_body['site_texts']).to include(include("id" => "title", "value" => value)) end end @@ -114,7 +114,7 @@ RSpec.describe Admin::SiteTextsController do ].each do |search_term| get "/admin/customize/site_texts.json", params: { q: search_term } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['site_texts']).to include(include("id" => "embed.loading", "value" => value)) + expect(response.parsed_body['site_texts']).to include(include("id" => "embed.loading", "value" => value)) end end @@ -125,11 +125,11 @@ RSpec.describe Admin::SiteTextsController do get "/admin/customize/site_texts.json", params: { q: 'missing_plural_key' } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['site_texts']).to be_empty + expect(response.parsed_body['site_texts']).to be_empty get "/admin/customize/site_texts.json", params: { q: 'another_missing_key' } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['site_texts']).to be_empty + expect(response.parsed_body['site_texts']).to be_empty end context 'plural keys' do @@ -205,7 +205,7 @@ RSpec.describe Admin::SiteTextsController do get "/admin/customize/site_texts/js.topic.list.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body site_text = json['site_text'] @@ -217,7 +217,7 @@ RSpec.describe Admin::SiteTextsController do get "/admin/customize/site_texts/js.emoji_picker.food_&_drink.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body site_text = json['site_text'] @@ -239,14 +239,14 @@ RSpec.describe Admin::SiteTextsController do get "/admin/customize/site_texts/#{key}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['site_text']['overridden']).to eq(true) TranslationOverride.destroy_all get "/admin/customize/site_texts/#{key}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['site_text']['overridden']).to eq(false) end @@ -265,7 +265,7 @@ RSpec.describe Admin::SiteTextsController do get "/admin/customize/site_texts/#{id}.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json).to be_present site_text = json['site_text'] @@ -312,7 +312,7 @@ RSpec.describe Admin::SiteTextsController do expect(response.status).to eq(404) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['error_type']).to eq('not_found') end @@ -323,7 +323,7 @@ RSpec.describe Admin::SiteTextsController do expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body site_text = json['site_text'] expect(site_text['id']).to eq('js.emoji_picker.animals_&_nature') @@ -337,7 +337,7 @@ RSpec.describe Admin::SiteTextsController do expect(response.status).to eq(403) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['error_type']).to eq('invalid_access') expect(json['errors'].size).to eq(1) expect(json['errors'].first).to eq(I18n.t('email_template_cant_be_modified')) @@ -352,7 +352,7 @@ RSpec.describe Admin::SiteTextsController do expect(response.status).to eq(422) - body = JSON.parse(response.body) + body = response.parsed_body expect(body['message']).to eq(I18n.t( 'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys', @@ -390,7 +390,7 @@ RSpec.describe Admin::SiteTextsController do put "/admin/customize/site_texts/title.json", params: { site_text: { value: 'hello' } } expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body site_text = json['site_text'] @@ -401,7 +401,7 @@ RSpec.describe Admin::SiteTextsController do delete "/admin/customize/site_texts/title.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body site_text = json['site_text'] @@ -422,24 +422,24 @@ RSpec.describe Admin::SiteTextsController do get "/admin/customize/site_texts/title.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['site_text']['value']).to eq(ru_title) get "/admin/customize/site_texts/js.topic.read_more_MF.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['site_text']['value']).to eq(ru_mf_text) SiteSetting.default_locale = :en get "/admin/customize/site_texts/title.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['site_text']['value']).to_not eq(ru_title) get "/admin/customize/site_texts/js.topic.read_more_MF.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['site_text']['value']).to_not eq(ru_mf_text) end diff --git a/spec/requests/admin/staff_action_logs_controller_spec.rb b/spec/requests/admin/staff_action_logs_controller_spec.rb index 9e639402e4..6d61fba42a 100644 --- a/spec/requests/admin/staff_action_logs_controller_spec.rb +++ b/spec/requests/admin/staff_action_logs_controller_spec.rb @@ -20,7 +20,7 @@ describe Admin::StaffActionLogsController do get "/admin/logs/staff_action_logs.json", params: { action_id: UserHistory.actions[:delete_topic] } - json = JSON.parse(response.body) + json = response.parsed_body expect(response.status).to eq(200) expect(json["staff_action_logs"].length).to eq(1) @@ -38,14 +38,14 @@ describe Admin::StaffActionLogsController do get "/admin/logs/staff_action_logs.json", params: { limit: 3 } - json = JSON.parse(response.body) + json = response.parsed_body expect(response.status).to eq(200) expect(json["staff_action_logs"].length).to eq(3) expect(json["staff_action_logs"][0]["new_value"]).to eq("value 4") get "/admin/logs/staff_action_logs.json", params: { limit: 3, page: 1 } - json = JSON.parse(response.body) + json = response.parsed_body expect(response.status).to eq(200) expect(json["staff_action_logs"].length).to eq(1) expect(json["staff_action_logs"][0]["new_value"]).to eq("value 1") @@ -59,7 +59,7 @@ describe Admin::StaffActionLogsController do it 'Uses the custom_staff id' do get "/admin/logs/staff_action_logs.json", params: {} - json = JSON.parse(response.body) + json = response.parsed_body action = json['extras']['user_history_actions'].first expect(action['id']).to eq plugin_extended_action.to_s @@ -84,7 +84,7 @@ describe Admin::StaffActionLogsController do get "/admin/logs/staff_action_logs/#{record.id}/diff.json" expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["side_by_side"]).to include("up") expect(parsed["side_by_side"]).to include("down") diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rb index 65dfbf3dd3..39e24e8940 100644 --- a/spec/requests/admin/themes_controller_spec.rb +++ b/spec/requests/admin/themes_controller_spec.rb @@ -17,30 +17,32 @@ describe Admin::ThemesController do it 'can generate key pairs' do post "/admin/themes/generate_key_pair.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["private_key"]).to include("RSA PRIVATE KEY") expect(json["public_key"]).to include("ssh-rsa ") end end describe '#upload_asset' do + let(:file) { file_from_fixtures("fake.woff2", "woff2") } + let(:filename) { File.basename(file) } let(:upload) do - Rack::Test::UploadedFile.new(file_from_fixtures("fake.woff2", "woff2")) + Rack::Test::UploadedFile.new(file) end it 'can create a theme upload' do post "/admin/themes/upload_asset.json", params: { file: upload } expect(response.status).to eq(201) - upload = Upload.find_by(original_filename: "fake.woff2") + upload = Upload.find_by(original_filename: filename) expect(upload.id).not_to be_nil - expect(JSON.parse(response.body)["upload_id"]).to eq(upload.id) + expect(response.parsed_body["upload_id"]).to eq(upload.id) end context "when trying to upload an existing file" do - let(:uploaded_file) { Upload.find_by(original_filename: "fake.woff2") } - let(:response_json) { JSON.parse(response.body) } + let(:uploaded_file) { Upload.find_by(original_filename: filename) } + let(:response_json) { response.parsed_body } before do post "/admin/themes/upload_asset.json", params: { file: upload } @@ -77,7 +79,7 @@ describe Admin::ThemesController do expect(response.status).to eq(201) end.to change { Theme.count }.by (1) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["theme"]["name"]).to eq("Awesome Theme") expect(json["theme"]["theme_fields"].length).to eq(3) @@ -110,7 +112,7 @@ describe Admin::ThemesController do post "/admin/themes/import.json", params: { theme: theme_json_file } expect(response.status).to eq(201) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["theme"]["name"]).to eq("Sam's Simple Theme") expect(json["theme"]["theme_fields"].length).to eq(2) @@ -124,7 +126,7 @@ describe Admin::ThemesController do post "/admin/themes/import.json", params: { theme: theme_archive } end.to change { Theme.count }.by (1) expect(response.status).to eq(201) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["theme"]["name"]).to eq("Header Icons") expect(json["theme"]["theme_fields"].length).to eq(5) @@ -139,7 +141,7 @@ describe Admin::ThemesController do post "/admin/themes/import.json", params: { bundle: theme_archive } end.to change { Theme.count }.by (0) expect(response.status).to eq(201) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["theme"]["name"]).to eq("Header Icons") expect(json["theme"]["theme_fields"].length).to eq(5) @@ -157,7 +159,7 @@ describe Admin::ThemesController do end.to change { Theme.count }.by (0) end expect(response.status).to eq(201) - json = ::JSON.parse(response.body) + json = response.parsed_body # Ensure only one refresh message is sent. # More than 1 is wasteful, and can trigger unusual race conditions in the client @@ -179,7 +181,7 @@ describe Admin::ThemesController do post "/admin/themes/import.json", params: { bundle: theme_archive, theme_id: nil } end.to change { Theme.count }.by (1) expect(response.status).to eq(201) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["theme"]["name"]).to eq("Header Icons") expect(json["theme"]["id"]).not_to eq(existing_theme.id) @@ -213,7 +215,7 @@ describe Admin::ThemesController do expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["extras"]["color_schemes"].length).to eq(2) theme_json = json["themes"].find { |t| t["id"] == theme.id } @@ -233,7 +235,7 @@ describe Admin::ThemesController do expect(response.status).to eq(201) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["theme"]["theme_fields"].length).to eq(1) expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1) @@ -293,7 +295,7 @@ describe Admin::ThemesController do expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body fields = json["theme"]["theme_fields"].sort { |a, b| a["value"] <=> b["value"] } @@ -329,7 +331,7 @@ describe Admin::ThemesController do # Response correct expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["theme"]["translations"][0]["value"]).to eq("overridenstring") # Database correct @@ -347,7 +349,7 @@ describe Admin::ThemesController do } # Response correct expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["theme"]["translations"][0]["value"]).to eq("defaultstring") # Database correct @@ -380,7 +382,7 @@ describe Admin::ThemesController do } } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["theme"]["enabled"]).to eq(false) expect(UserHistory.where( context: child.id.to_s, @@ -415,7 +417,7 @@ describe Admin::ThemesController do } } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(UserHistory.where( context: child.id.to_s, @@ -441,7 +443,7 @@ describe Admin::ThemesController do theme: { remote_update: true } } expect(response.status).to eq(422) - expect(JSON.parse(response.body)["errors"].first).to eq("error message") + expect(response.parsed_body["errors"].first).to eq("error message") end it 'returns the right error message' do @@ -452,7 +454,7 @@ describe Admin::ThemesController do } expect(response.status).to eq(400) - expect(JSON.parse(response.body)["errors"].first).to include(I18n.t("themes.errors.component_no_default")) + expect(response.parsed_body["errors"].first).to include(I18n.t("themes.errors.component_no_default")) end end @@ -512,7 +514,7 @@ describe Admin::ThemesController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)["bg"]).to eq("green") + expect(response.parsed_body["bg"]).to eq("green") theme.reload expect(theme.included_settings[:bg]).to eq("green") diff --git a/spec/requests/admin/user_fields_controller_spec.rb b/spec/requests/admin/user_fields_controller_spec.rb index 9bcbd6cc18..672e1f6ede 100644 --- a/spec/requests/admin/user_fields_controller_spec.rb +++ b/spec/requests/admin/user_fields_controller_spec.rb @@ -49,7 +49,7 @@ describe Admin::UserFieldsController do it "returns a list of user fields" do get "/admin/customize/user_fields.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['user_fields']).to be_present end end diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb index 273ff48192..099372cad0 100644 --- a/spec/requests/admin/users_controller_spec.rb +++ b/spec/requests/admin/users_controller_spec.rb @@ -19,14 +19,14 @@ RSpec.describe Admin::UsersController do it 'returns success with JSON' do get "/admin/users/list.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body)).to be_present + expect(response.parsed_body).to be_present end context 'when showing emails' do it "returns email for all the users" do get "/admin/users/list.json", params: { show_emails: "true" } expect(response.status).to eq(200) - data = ::JSON.parse(response.body) + data = response.parsed_body data.each do |user| expect(user["email"]).to be_present end @@ -293,7 +293,7 @@ RSpec.describe Admin::UsersController do fab!(:another_user) { Fabricate(:coding_horror) } after do - Discourse.redis.flushall + Discourse.redis.flushdb end it "raises an error when the user doesn't have permission" do @@ -582,7 +582,7 @@ RSpec.describe Admin::UsersController do it "returns an api response that the user can't be deleted because it has posts" do delete "/admin/users/#{delete_me.id}.json" expect(response.status).to eq(403) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['deleted']).to eq(false) end @@ -608,7 +608,7 @@ RSpec.describe Admin::UsersController do it "returns success" do put "/admin/users/#{reg_user.id}/activate.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['success']).to eq("OK") reg_user.reload expect(reg_user.active).to eq(true) @@ -634,7 +634,7 @@ RSpec.describe Admin::UsersController do it "returns success" do put "/admin/users/#{reg_user.id}/deactivate.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['success']).to eq("OK") reg_user.reload expect(reg_user.active).to eq(false) @@ -647,7 +647,7 @@ RSpec.describe Admin::UsersController do it "returns success" do post "/admin/users/#{reg_user.id}/log_out.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['success']).to eq("OK") end @@ -765,7 +765,7 @@ RSpec.describe Admin::UsersController do get "/admin/users/ip-info.json", params: { ip: ip } expect(response.status).to eq(200) - expect(JSON.parse(response.body).symbolize_keys).to eq( + expect(response.parsed_body.symbolize_keys).to eq( city: "London", country: "United Kingdom", country_code: "GB", @@ -848,7 +848,7 @@ RSpec.describe Admin::UsersController do post "/admin/users/sync_sso.json", params: Rack::Utils.parse_query(sso.payload) expect(response.status).to eq(403) - expect(JSON.parse(response.body)["message"]).to include("Primary email can't be blank") + expect(response.parsed_body["message"]).to include("Primary email can't be blank") end it 'should return the right message if the signature is invalid' do @@ -860,8 +860,8 @@ RSpec.describe Admin::UsersController do correct_payload = Rack::Utils.parse_query(sso.payload) post "/admin/users/sync_sso.json", params: correct_payload.merge(sig: "someincorrectsignature") expect(response.status).to eq(422) - expect(JSON.parse(response.body)["message"]).to include(I18n.t('sso.login_error')) - expect(JSON.parse(response.body)["message"]).not_to include(correct_payload["sig"]) + expect(response.parsed_body["message"]).to include(I18n.t('sso.login_error')) + expect(response.parsed_body["message"]).not_to include(correct_payload["sig"]) end it "returns 404 if the external id does not exist" do @@ -871,7 +871,7 @@ RSpec.describe Admin::UsersController do sso.external_id = "" post "/admin/users/sync_sso.json", params: Rack::Utils.parse_query(sso.payload) expect(response.status).to eq(422) - expect(JSON.parse(response.body)["message"]).to include(I18n.t('sso.blank_id_error')) + expect(response.parsed_body["message"]).to include(I18n.t('sso.blank_id_error')) end end @@ -975,7 +975,7 @@ RSpec.describe Admin::UsersController do it 'returns how many posts were deleted' do put "/admin/users/#{user.id}/delete_posts_batch.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body)["posts_deleted"]).to eq(3) + expect(response.parsed_body["posts_deleted"]).to eq(3) end end @@ -983,7 +983,7 @@ RSpec.describe Admin::UsersController do it "returns correct json" do put "/admin/users/#{user.id}/delete_posts_batch.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body)["posts_deleted"]).to eq(0) + expect(response.parsed_body["posts_deleted"]).to eq(0) end end end diff --git a/spec/requests/admin/versions_controller_spec.rb b/spec/requests/admin/versions_controller_spec.rb index 8922c99585..2057f3700a 100644 --- a/spec/requests/admin/versions_controller_spec.rb +++ b/spec/requests/admin/versions_controller_spec.rb @@ -25,13 +25,13 @@ describe Admin::VersionsController do it 'should return the currently available version' do get "/admin/version_check.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['latest_version']).to eq('1.2.33') end it "should return the installed version" do get "/admin/version_check.json" - json = JSON.parse(response.body) + json = response.parsed_body expect(response.status).to eq(200) expect(json['installed_version']).to eq(Discourse::VERSION::STRING) end diff --git a/spec/requests/admin/web_hooks_controller_spec.rb b/spec/requests/admin/web_hooks_controller_spec.rb index be8e36f7ac..125032351a 100644 --- a/spec/requests/admin/web_hooks_controller_spec.rb +++ b/spec/requests/admin/web_hooks_controller_spec.rb @@ -34,7 +34,7 @@ describe Admin::WebHooksController do expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["web_hook"]["payload_url"]).to eq("https://meta.discourse.org/") expect(UserHistory.where(acting_user_id: admin.id, action: UserHistory.actions[:web_hook_create]).count).to eq(1) end @@ -54,7 +54,7 @@ describe Admin::WebHooksController do } expect(response.status).to eq(422) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body["errors"]).to be_present end diff --git a/spec/requests/api/categories_spec.rb b/spec/requests/api/categories_spec.rb index 0c82cfa389..5de0bdeee9 100644 --- a/spec/requests/api/categories_spec.rb +++ b/spec/requests/api/categories_spec.rb @@ -4,6 +4,7 @@ require 'swagger_helper' describe 'categories' do let(:admin) { Fabricate(:admin) } + let!(:category) { Fabricate(:category, user: admin) } before do Jobs.run_immediately! @@ -13,11 +14,7 @@ describe 'categories' do path '/categories.json' do post 'Creates a category' do - before do - Jobs.run_immediately! - sign_in(admin) - end - tags 'Category' + tags 'Categories' consumes 'application/json' parameter name: :category, in: :body, schema: { type: :object, @@ -38,6 +35,46 @@ describe 'categories' do id: { type: :integer }, name: { type: :string }, color: { type: :string }, + text_color: { type: :string }, + slug: { type: :string }, + topic_count: { type: :integer }, + post_count: { type: :integer }, + position: { type: :integer }, + description: { type: :string, nullable: true }, + description_text: { type: :string, nullable: true }, + topic_url: { type: :string }, + read_restricted: { type: :boolean }, + permission: { type: :integer, nullable: true }, + notification_level: { type: :integer, nullable: true }, + can_edit: { type: :boolean }, + topic_template: { type: :string, nullable: true }, + has_children: { type: :boolean, nullable: true }, + sort_order: { type: :string, nullable: true }, + show_subcategory_list: { type: :boolean }, + num_featured_topics: { type: :integer }, + default_view: { type: :string, nullable: true }, + subcategory_list_style: { type: :string }, + default_topic_period: { type: :string }, + minimum_required_tags: { type: :integer }, + navigate_to_first_post_after_read: { type: :boolean }, + custom_fields: { type: :object }, + min_tags_from_required_group: { type: :integer }, + required_tag_group_name: { type: :string, nullable: true }, + available_groups: { type: :array }, + auto_close_hours: { type: :integer, nullable: true }, + auto_close_based_on_last_post: { type: :boolean }, + group_permissions: { type: :array }, + email_in: { type: :boolean, nullable: true }, + email_in_allow_strangers: { type: :boolean }, + mailinglist_mirror: { type: :boolean }, + all_topics_wiki: { type: :boolean }, + can_delete: { type: :boolean }, + cannot_delete_reason: { type: :string, nullable: true }, + allow_badges: { type: :boolean }, + topic_featured_link_allowed: { type: :boolean }, + search_priority: { type: :integer }, + uploaded_logo: { type: :string, nullable: true }, + uploaded_background: { type: :string, nullable: true }, }, required: ["id"] } @@ -49,7 +86,7 @@ describe 'categories' do end get 'Retreives a list of categories' do - tags 'Category' + tags 'Categories' produces 'application/json' response '200', 'categories response' do @@ -62,7 +99,46 @@ describe 'categories' do draft: { type: :string, nullable: true }, draft_key: { type: :string }, draft_sequence: { type: :integer }, - categories: { type: :array }, + categories: { + type: :array, + items: { + type: :object, + properties: { + id: { type: :integer }, + name: { type: :string }, + color: { type: :string }, + text_color: { type: :string }, + slug: { type: :string }, + topic_count: { type: :integer }, + post_count: { type: :integer }, + position: { type: :integer }, + description: { type: :string, nullable: true }, + description_text: { type: :string, nullable: true }, + topic_url: { type: :string, nullable: true }, + read_restricted: { type: :boolean }, + permission: { type: :integer, nullable: true }, + notification_level: { type: :integer, nullable: true }, + can_edit: { type: :boolean }, + topic_template: { type: :string, nullable: true }, + has_children: { type: :boolean, nullable: true }, + sort_order: { type: :string, nullable: true }, + show_subcategory_list: { type: :boolean }, + num_featured_topics: { type: :integer }, + default_view: { type: :string, nullable: true }, + subcategory_list_style: { type: :string }, + default_topic_period: { type: :string }, + minimum_required_tags: { type: :integer }, + navigate_to_first_post_after_read: { type: :boolean }, + topics_day: { type: :integer }, + topics_week: { type: :integer }, + topics_month: { type: :integer }, + topics_year: { type: :integer }, + topics_all_time: { type: :integer }, + uploaded_logo: { type: :string, nullable: true }, + uploaded_background: { type: :string, nullable: true }, + } + } + }, }, required: ["categories"] } }, required: ["category_list"] @@ -70,4 +146,274 @@ describe 'categories' do end end end + + path '/categories/{category_id}.json' do + + put 'Updates a category' do + tags 'Categories' + consumes 'application/json' + parameter name: :category_id, in: :path, schema: { type: :string } + parameter name: :category, in: :body, schema: { + type: :object, + properties: { + name: { type: :string }, + color: { type: :string }, + text_color: { type: :string }, + }, + required: [ 'name', 'color', 'text_color' ] + } + + produces 'application/json' + response '200', 'category created' do + schema type: :object, properties: { + success: { type: :string }, + category: { + type: :object, + properties: { + id: { type: :integer }, + name: { type: :string }, + color: { type: :string }, + text_color: { type: :string }, + slug: { type: :string }, + topic_count: { type: :integer }, + post_count: { type: :integer }, + position: { type: :integer }, + description: { type: :string, nullable: true }, + description_text: { type: :string, nullable: true }, + description_excerpt: { type: :string, nullable: true }, + topic_url: { type: :string, nullable: true }, + read_restricted: { type: :boolean }, + permission: { type: :string, nullable: true }, + notification_level: { type: :integer, nullable: true }, + can_edit: { type: :boolean }, + topic_template: { type: :string, nullable: true }, + has_children: { type: :string, nullable: true }, + sort_order: { type: :string, nullable: true }, + sort_ascending: { type: :string, nullable: true }, + show_subcategory_list: { type: :boolean }, + num_featured_topics: { type: :integer }, + default_view: { type: :string, nullable: true }, + subcategory_list_style: { type: :string }, + default_top_period: { type: :string }, + minimum_required_tags: { type: :integer }, + navigate_to_first_post_after_read: { type: :boolean }, + custom_fields: { + type: :object, + properties: { + } + }, + min_tags_from_required_group: { type: :integer }, + required_tag_group_name: { type: :string, nullable: true }, + available_groups: { + type: :array, + items: { + }, + }, + auto_close_hours: { type: :string, nullable: true }, + auto_close_based_on_last_post: { type: :boolean }, + group_permissions: { + type: :array, + items: { + type: :object, + properties: { + permission_type: { type: :integer }, + group_name: { type: :string }, + } + }, + }, + email_in: { type: :string, nullable: true }, + email_in_allow_strangers: { type: :boolean }, + mailinglist_mirror: { type: :boolean }, + all_topics_wiki: { type: :boolean }, + can_delete: { type: :boolean }, + cannot_delete_reason: { type: :string, nullable: true }, + allow_badges: { type: :boolean }, + topic_featured_link_allowed: { type: :boolean }, + search_priority: { type: :integer }, + uploaded_logo: { type: :string, nullable: true }, + uploaded_background: { type: :string, nullable: true }, + } + }, + } + + let(:category_id) { category.id } + run_test! + end + end + end + + path '/c/{category_id}.json' do + + get 'List topics' do + tags 'Categories' + produces 'application/json' + parameter name: :category_id, in: :path, schema: { type: :string } + + response '200', 'response' do + schema type: :object, properties: { + users: { + type: :array, + items: { + type: :object, + properties: { + id: { type: :integer }, + username: { type: :string }, + name: { type: :string, nullable: true }, + avatar_template: { type: :string }, + } + } + }, + primary_groups: { + type: :array + }, + topic_list: { + type: :object, + properties: { + can_create_topic: { type: :boolean }, + draft: { type: :string, nullable: true }, + draft_key: { type: :string }, + draft_sequence: { type: :integer }, + per_page: { type: :integer }, + topics: { + type: :array, + items: { + type: :object, + properties: { + id: { type: :integer }, + title: { type: :string }, + fancy_title: { type: :string }, + slug: { type: :string }, + posts_count: { type: :integer }, + reply_count: { type: :integer }, + highest_post_number: { type: :integer }, + image_url: { type: :string, nullable: true }, + created_at: { type: :string }, + last_posted_at: { type: :string }, + bumped: { type: :boolean }, + bumped_at: { type: :string }, + archetype: { type: :string }, + unseen: { type: :boolean }, + pinned: { type: :boolean }, + unpinned: { type: :boolean, nullable: true }, + excerpt: { type: :string }, + visible: { type: :boolean }, + closed: { type: :boolean }, + archived: { type: :boolean }, + bookmarked: { type: :boolean, nullable: true }, + liked: { type: :boolean, nullable: true }, + views: { type: :integer }, + like_count: { type: :integer }, + has_summary: { type: :boolean }, + last_poster_username: { type: :string }, + category_id: { type: :integer }, + op_like_count: { type: :integer }, + pinned_globally: { type: :boolean }, + featured_link: { type: :string, nullable: true }, + posters: { + type: :array, + items: { + type: :object, + properties: { + extras: { type: :string }, + description: { type: :string }, + user_id: { type: :integer }, + primary_group_id: { type: :integer, nullable: true }, + } + } + } + } + } + } + } + } + } + let(:category_id) { category.id } + run_test! + end + end + end + + path '/c/{category_id}/show.json' do + + get 'Show category' do + tags 'Categories' + produces 'application/json' + parameter name: :category_id, in: :path, schema: { type: :string } + + response '200', 'response' do + schema type: :object, properties: { + category: { + type: :object, + properties: { + id: { type: :integer }, + name: { type: :string }, + color: { type: :string }, + text_color: { type: :string }, + slug: { type: :string }, + topic_count: { type: :integer }, + post_count: { type: :integer }, + position: { type: :integer }, + description: { type: :string, nullable: true }, + description_text: { type: :string, nullable: true }, + description_excerpt: { type: :string, nullable: true }, + topic_url: { type: :string, nullable: true }, + read_restricted: { type: :boolean }, + permission: { type: :integer }, + notification_level: { type: :integer, nullable: true }, + can_edit: { type: :boolean }, + topic_template: { type: :string, nullable: true }, + has_children: { type: :string, nullable: true }, + sort_order: { type: :string, nullable: true }, + sort_ascending: { type: :string, nullable: true }, + show_subcategory_list: { type: :boolean }, + num_featured_topics: { type: :integer }, + default_view: { type: :string, nullable: true }, + subcategory_list_style: { type: :string }, + default_top_period: { type: :string }, + minimum_required_tags: { type: :integer }, + navigate_to_first_post_after_read: { type: :boolean }, + custom_fields: { + type: :object, + properties: { + } + }, + min_tags_from_required_group: { type: :integer }, + required_tag_group_name: { type: :string, nullable: true }, + available_groups: { + type: :array, + items: { + }, + }, + auto_close_hours: { type: :string, nullable: true }, + auto_close_based_on_last_post: { type: :boolean }, + group_permissions: { + type: :array, + items: { + type: :object, + properties: { + permission_type: { type: :integer }, + group_name: { type: :string }, + } + }, + }, + email_in: { type: :string, nullable: true }, + email_in_allow_strangers: { type: :boolean }, + mailinglist_mirror: { type: :boolean }, + all_topics_wiki: { type: :boolean }, + can_delete: { type: :boolean }, + cannot_delete_reason: { type: :string, nullable: true }, + allow_badges: { type: :boolean }, + topic_featured_link_allowed: { type: :boolean }, + search_priority: { type: :integer }, + uploaded_logo: { type: :string, nullable: true }, + uploaded_background: { type: :string, nullable: true }, + } + }, + } + let(:category_id) { category.id } + run_test! + end + end + end + end diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb new file mode 100644 index 0000000000..ab3112aa89 --- /dev/null +++ b/spec/requests/api/groups_spec.rb @@ -0,0 +1,79 @@ +# frozen_string_literal: true +require 'swagger_helper' + +describe 'groups' do + + let(:admin) { Fabricate(:admin) } + + before do + Jobs.run_immediately! + sign_in(admin) + end + + path '/admin/groups.json' do + + post 'Creates a group' do + tags 'Group' + consumes 'application/json' + parameter name: :group, in: :body, schema: { + type: :object, + properties: { + group: { + type: :object, + properties: { + name: { type: :string }, + }, required: [ 'name' ] + } + }, + } + + produces 'application/json' + response '200', 'group created' do + schema type: :object, properties: { + basic_group: { + type: :object, + properties: { + id: { type: :integer }, + automatic: { type: :boolean }, + name: { type: :string }, + user_count: { type: :integer }, + mentionable_level: { type: :integer }, + messageable_level: { type: :integer }, + visibility_level: { type: :integer }, + automatic_membership_email_domains: { type: :string, nullable: true }, + automatic_membership_retroactive: { type: :boolean }, + primary_group: { type: :boolean }, + title: { type: :string, nullable: true }, + grant_trust_level: { type: :string, nullable: true }, + incoming_email: { type: :string, nullable: true }, + has_messages: { type: :boolean }, + flair_url: { type: :string, nullable: true }, + flair_bg_color: { type: :string, nullable: true }, + flair_color: { type: :string, nullable: true }, + bio_raw: { type: :string, nullable: true }, + bio_cooked: { type: :string, nullable: true }, + bio_excerpt: { type: :string, nullable: true }, + public_admission: { type: :boolean }, + public_exit: { type: :boolean }, + allow_membership_requests: { type: :boolean }, + full_name: { type: :string, nullable: true }, + default_notification_level: { type: :integer }, + membership_request_template: { type: :string, nullable: true }, + membership_visibility_level: { type: :integer }, + can_see_members: { type: :boolean }, + publish_read_state: { type: :boolean }, + }, + required: ["id"] + } + }, required: ["basic_group"] + + let(:group) { { name: 'awesome' } } + run_test! do |response| + data = JSON.parse(response.body) + expect(data['basic_group']['name']).to eq("awesome") + end + end + end + + end +end diff --git a/spec/requests/api/posts_spec.rb b/spec/requests/api/posts_spec.rb new file mode 100644 index 0000000000..d232cae183 --- /dev/null +++ b/spec/requests/api/posts_spec.rb @@ -0,0 +1,484 @@ +# frozen_string_literal: true +require 'swagger_helper' + +describe 'posts' do + + let(:'Api-Key') { Fabricate(:api_key).key } + let(:'Api-Username') { 'system' } + + path '/posts.json' do + + get 'List latest posts across topics' do + tags 'Posts' + parameter name: 'Api-Key', in: :header, type: :string, required: true + parameter name: 'Api-Username', in: :header, type: :string, required: true + produces 'application/json' + + response '200', 'latest posts' do + schema type: :object, properties: { + latest_posts: { + type: :array, + items: { + type: :object, + properties: { + id: { type: :integer }, + name: { type: :string }, + username: { type: :string }, + avatar_template: { type: :string }, + created_at: { type: :string }, + cooked: { type: :string }, + post_number: { type: :integer }, + post_type: { type: :integer }, + updated_at: { type: :string }, + reply_count: { type: :integer }, + reply_to_post_number: { type: :string, nullable: true }, + quote_count: { type: :integer }, + incoming_link_count: { type: :integer }, + reads: { type: :integer }, + readers_count: { type: :integer }, + score: { type: :number }, + yours: { type: :boolean }, + topic_id: { type: :integer }, + topic_slug: { type: :string }, + topic_title: { type: :string }, + topic_html_title: { type: :string }, + category_id: { type: :integer }, + display_username: { type: :string }, + primary_group_name: { type: :string, nullable: true }, + primary_group_flair_url: { type: :string, nullable: true }, + primary_group_flair_bg_color: { type: :string, nullable: true }, + primary_group_flair_color: { type: :string, nullable: true }, + version: { type: :integer }, + can_edit: { type: :boolean }, + can_delete: { type: :boolean }, + can_recover: { type: :boolean }, + can_wiki: { type: :boolean }, + user_title: { type: :string, nullable: true }, + raw: { type: :string }, + actions_summary: { + type: :array, + items: { + type: :object, + properties: { + id: { type: :integer }, + can_act: { type: :boolean }, + } + }, + }, + moderator: { type: :boolean }, + admin: { type: :boolean }, + staff: { type: :boolean }, + user_id: { type: :integer }, + hidden: { type: :boolean }, + trust_level: { type: :integer }, + deleted_at: { type: :string, nullable: true }, + user_deleted: { type: :boolean }, + edit_reason: { type: :string, nullable: true }, + can_view_edit_history: { type: :boolean }, + wiki: { type: :boolean }, + reviewable_id: { type: :string, nullable: true }, + reviewable_score_count: { type: :integer }, + reviewable_score_pending_count: { type: :integer }, + } + }, + }, + } + + let!(:post) { Fabricate(:post) } + run_test! + end + end + + post 'Creates a new topic, a new post, or a private message' do + tags 'Posts' + consumes 'application/json' + parameter name: 'Api-Key', in: :header, type: :string, required: true + parameter name: 'Api-Username', in: :header, type: :string, required: true + # Can't be named :post! + parameter name: :post_body, in: :body, schema: { + type: :object, + properties: { + title: { + type: :string, + description: 'Required if creating a new topic or new private message.' + }, + topic_id: { + type: :integer, + description: 'Required if creating a new post.' + }, + raw: { type: :string }, + category: { + type: :integer, + description: 'Optional if creating a new topic, and ignored if creating a new post.' + }, + target_usernames: { + type: :string, + description: 'Required for private message, comma separated.', + example: 'blake,sam' + }, + archetype: { type: :string }, + created_at: { type: :string }, + }, + required: [ 'raw' ] + } + + produces 'application/json' + response '200', 'post created' do + schema type: :object, properties: { + id: { type: :integer }, + name: { type: :string, nullable: true }, + username: { type: :string }, + avatar_template: { type: :string }, + created_at: { type: :string }, + cooked: { type: :string }, + post_number: { type: :integer }, + post_type: { type: :integer }, + updated_at: { type: :string }, + reply_count: { type: :integer }, + reply_to_post_number: { type: :string, nullable: true }, + quote_count: { type: :integer }, + incoming_link_count: { type: :integer }, + reads: { type: :integer }, + readers_count: { type: :integer }, + score: { type: :integer }, + yours: { type: :boolean }, + topic_id: { type: :integer }, + topic_slug: { type: :string }, + display_username: { type: :string, nullable: true }, + primary_group_name: { type: :string, nullable: true }, + primary_group_flair_url: { type: :string, nullable: true }, + primary_group_flair_bg_color: { type: :string, nullable: true }, + primary_group_flair_color: { type: :string, nullable: true }, + version: { type: :integer }, + can_edit: { type: :boolean }, + can_delete: { type: :boolean }, + can_recover: { type: :boolean }, + can_wiki: { type: :boolean }, + user_title: { type: :string, nullable: true }, + actions_summary: { + type: :array, + items: { + type: :object, + properties: { + id: { type: :integer }, + can_act: { type: :boolean }, + } + }, + }, + moderator: { type: :boolean }, + admin: { type: :boolean }, + staff: { type: :boolean }, + user_id: { type: :integer }, + draft_sequence: { type: :integer }, + hidden: { type: :boolean }, + trust_level: { type: :integer }, + deleted_at: { type: :string, nullable: true }, + user_deleted: { type: :boolean }, + edit_reason: { type: :string, nullable: true }, + can_view_edit_history: { type: :boolean }, + wiki: { type: :boolean }, + reviewable_id: { type: :string, nullable: true }, + reviewable_score_count: { type: :integer }, + reviewable_score_pending_count: { type: :integer }, + } + + let(:post_body) { Fabricate(:post) } + run_test! + end + end + end + + path '/posts/{id}.json' do + + get 'Retreive a single post' do + tags 'Posts' + parameter name: 'Api-Key', in: :header, type: :string, required: true + parameter name: 'Api-Username', in: :header, type: :string, required: true + parameter name: :id, in: :path, schema: { type: :string } + + produces 'application/json' + + response '200', 'latest posts' do + schema type: :object, properties: { + id: { type: :integer }, + name: { type: :string, nullable: true }, + username: { type: :string }, + avatar_template: { type: :string }, + created_at: { type: :string }, + cooked: { type: :string }, + post_number: { type: :integer }, + post_type: { type: :integer }, + updated_at: { type: :string }, + reply_count: { type: :integer }, + reply_to_post_number: { type: :string, nullable: true }, + quote_count: { type: :integer }, + incoming_link_count: { type: :integer }, + reads: { type: :integer }, + readers_count: { type: :integer }, + score: { type: :integer }, + yours: { type: :boolean }, + topic_id: { type: :integer }, + topic_slug: { type: :string }, + display_username: { type: :string, nullable: true }, + primary_group_name: { type: :string, nullable: true }, + primary_group_flair_url: { type: :string, nullable: true }, + primary_group_flair_bg_color: { type: :string, nullable: true }, + primary_group_flair_color: { type: :string, nullable: true }, + version: { type: :integer }, + can_edit: { type: :boolean }, + can_delete: { type: :boolean }, + can_recover: { type: :boolean }, + can_wiki: { type: :boolean }, + user_title: { type: :string, nullable: true }, + raw: { type: :string }, + actions_summary: { + type: :array, + items: { + type: :object, + properties: { + id: { type: :integer }, + can_act: { type: :boolean }, + } + }, + }, + moderator: { type: :boolean }, + admin: { type: :boolean }, + staff: { type: :boolean }, + user_id: { type: :integer }, + hidden: { type: :boolean }, + trust_level: { type: :integer }, + deleted_at: { type: :string, nullable: true }, + user_deleted: { type: :boolean }, + edit_reason: { type: :string, nullable: true }, + can_view_edit_history: { type: :boolean }, + wiki: { type: :boolean }, + reviewable_id: { type: :string, nullable: true }, + reviewable_score_count: { type: :integer }, + reviewable_score_pending_count: { type: :integer }, + } + + let(:id) { Fabricate(:post).id } + run_test! + end + end + + put 'Update a single post' do + tags 'Posts' + consumes 'application/json' + parameter name: 'Api-Key', in: :header, type: :string, required: true + parameter name: 'Api-Username', in: :header, type: :string, required: true + parameter name: :id, in: :path, schema: { type: :string } + + parameter name: :post_body, in: :body, schema: { + type: :object, + properties: { + post: { + type: :object, + properties: { + raw: { type: :string }, + edit_reason: { type: :string }, + }, required: [ 'raw' ] + } + } + } + + produces 'application/json' + response '200', 'post updated' do + schema type: :object, properties: { + post: { + type: :object, + properties: { + id: { type: :integer }, + name: { type: :string, nullable: true }, + username: { type: :string }, + avatar_template: { type: :string }, + created_at: { type: :string }, + cooked: { type: :string }, + post_number: { type: :integer }, + post_type: { type: :integer }, + updated_at: { type: :string }, + reply_count: { type: :integer }, + reply_to_post_number: { type: :string, nullable: true }, + quote_count: { type: :integer }, + incoming_link_count: { type: :integer }, + reads: { type: :integer }, + readers_count: { type: :integer }, + score: { type: :number }, + yours: { type: :boolean }, + topic_id: { type: :integer }, + topic_slug: { type: :string }, + display_username: { type: :string, nullable: true }, + primary_group_name: { type: :string, nullable: true }, + primary_group_flair_url: { type: :string, nullable: true }, + primary_group_flair_bg_color: { type: :string, nullable: true }, + primary_group_flair_color: { type: :string, nullable: true }, + version: { type: :integer }, + can_edit: { type: :boolean }, + can_delete: { type: :boolean }, + can_recover: { type: :boolean }, + can_wiki: { type: :boolean }, + user_title: { type: :string, nullable: true }, + actions_summary: { + type: :array, + items: { + type: :object, + properties: { + id: { type: :integer }, + can_act: { type: :boolean }, + } + }, + }, + moderator: { type: :boolean }, + admin: { type: :boolean }, + staff: { type: :boolean }, + user_id: { type: :integer }, + draft_sequence: { type: :integer }, + hidden: { type: :boolean }, + trust_level: { type: :integer }, + deleted_at: { type: :string, nullable: true }, + user_deleted: { type: :boolean }, + edit_reason: { type: :string, nullable: true }, + can_view_edit_history: { type: :boolean }, + wiki: { type: :boolean }, + reviewable_id: { type: :string, nullable: true }, + reviewable_score_count: { type: :integer }, + reviewable_score_pending_count: { type: :integer }, + } + }, + } + + let(:post_body) { { 'post': { 'raw': 'Updated content!', 'edit_reason': 'fixed typo' } } } + let(:id) { Fabricate(:post).id } + + run_test! do |response| + data = JSON.parse(response.body) + expect(data['post']['cooked']).to eq("

Updated content!

") + expect(data['post']['edit_reason']).to eq("fixed typo") + end + end + end + end + + path '/posts/{id}/locked.json' do + put 'Lock a post from being edited' do + tags 'Posts' + consumes 'application/json' + parameter name: 'Api-Key', in: :header, type: :string, required: true + parameter name: 'Api-Username', in: :header, type: :string, required: true + parameter name: :id, in: :path, schema: { type: :string } + + parameter name: :post_body, in: :body, schema: { + type: :object, + properties: { + locked: { type: :boolean } + }, required: [ 'locked' ] + } + + produces 'application/json' + response '200', 'post updated' do + schema type: :object, properties: { + locked: { type: :boolean }, + } + + let(:post_body) { { 'locked': 'true' } } + let(:id) { Fabricate(:post).id } + + run_test! do |response| + data = JSON.parse(response.body) + expect(data['locked']).to eq(true) + end + end + end + end + + path '/post_actions.json' do + post 'Like a post and other actions' do + tags 'Posts' + consumes 'application/json' + parameter name: 'Api-Key', in: :header, type: :string, required: true + parameter name: 'Api-Username', in: :header, type: :string, required: true + + parameter name: :post_body, in: :body, schema: { + type: :object, + properties: { + id: { type: :integer }, + post_action_type_id: { type: :integer }, + flag_topic: { type: :boolean }, + }, required: [ 'id', 'post_action_type_id' ] + } + + produces 'application/json' + response '200', 'post updated' do + schema type: :object, properties: { + id: { type: :integer }, + name: { type: :string }, + username: { type: :string }, + avatar_template: { type: :string }, + created_at: { type: :string }, + cooked: { type: :string }, + post_number: { type: :integer }, + post_type: { type: :integer }, + updated_at: { type: :string }, + reply_count: { type: :integer }, + reply_to_post_number: { type: :string, nullable: true }, + quote_count: { type: :integer }, + incoming_link_count: { type: :integer }, + reads: { type: :integer }, + readers_count: { type: :integer }, + score: { type: :number }, + yours: { type: :boolean }, + topic_id: { type: :integer }, + topic_slug: { type: :string }, + display_username: { type: :string }, + primary_group_name: { type: :string, nullable: true }, + primary_group_flair_url: { type: :string, nullable: true }, + primary_group_flair_bg_color: { type: :string, nullable: true }, + primary_group_flair_color: { type: :string, nullable: true }, + version: { type: :integer }, + can_edit: { type: :boolean }, + can_delete: { type: :boolean }, + can_recover: { type: :boolean }, + can_wiki: { type: :boolean }, + user_title: { type: :string, nullable: true }, + actions_summary: { + type: :array, + items: { + type: :object, + properties: { + id: { type: :integer }, + count: { type: :integer }, + acted: { type: :boolean }, + can_undo: { type: :boolean }, + } + }, + }, + moderator: { type: :boolean }, + admin: { type: :boolean }, + staff: { type: :boolean }, + user_id: { type: :integer }, + hidden: { type: :boolean }, + trust_level: { type: :integer }, + deleted_at: { type: :string, nullable: true }, + user_deleted: { type: :boolean }, + edit_reason: { type: :string, nullable: true }, + can_view_edit_history: { type: :boolean }, + wiki: { type: :boolean }, + notice_type: { type: :string }, + reviewable_id: { type: :string, nullable: true }, + reviewable_score_count: { type: :integer }, + reviewable_score_pending_count: { type: :integer }, + } + + let(:id) { Fabricate(:post).id } + let(:post_body) { { id: id, post_action_type_id: 2 } } + + run_test! do |response| + data = JSON.parse(response.body) + expect(data['actions_summary'][0]['id']).to eq(2) + expect(data['actions_summary'][0]['count']).to eq(1) + end + end + end + end + +end diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb new file mode 100644 index 0000000000..925f3be083 --- /dev/null +++ b/spec/requests/api/users_spec.rb @@ -0,0 +1,55 @@ +# frozen_string_literal: true +require 'swagger_helper' + +describe 'users' do + + let(:'Api-Key') { Fabricate(:api_key).key } + let(:'Api-Username') { 'system' } + + path '/users.json' do + + post 'Creates a user' do + tags 'Users' + consumes 'application/json' + parameter name: 'Api-Key', in: :header, type: :string, required: true + parameter name: 'Api-Username', in: :header, type: :string, required: true + parameter name: :user_body, in: :body, schema: { + type: :object, + properties: { + "name": { type: :string }, + "email": { type: :string }, + "password": { type: :string }, + "username": { type: :string }, + "active": { type: :boolean }, + "approved": { type: :boolean }, + "user_fields[1]": { type: :string }, + }, + required: ['name', 'email', 'password', 'username'] + } + + produces 'application/json' + response '200', 'user created' do + schema type: :object, properties: { + success: { type: :boolean }, + active: { type: :boolean }, + message: { type: :string }, + user_id: { type: :integer }, + } + + let(:user_body) { { + name: 'user', + username: 'user1', + email: 'user1@example.com', + password: '13498428e9597cab689b468ebc0a5d33', + active: true + } } + run_test! do |response| + data = JSON.parse(response.body) + expect(data['success']).to eq(true) + expect(data['active']).to eq(true) + end + end + end + + end +end diff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rb index 4d551942f6..8e4dc439d8 100644 --- a/spec/requests/application_controller_spec.rb +++ b/spec/requests/application_controller_spec.rb @@ -232,7 +232,7 @@ RSpec.describe ApplicationController do expect(log).not_to include('exception app middleware') - expect(JSON.parse(response.body)).to eq( + expect(response.parsed_body).to eq( "status" => 400, "error" => "Bad Request" ) @@ -245,7 +245,7 @@ RSpec.describe ApplicationController do get "/search/query.json", params: { trem: "misspelled term" } expect(response.status).to eq(400) - expect(JSON.parse(response.body)).to eq( + expect(response.parsed_body).to eq( "errors" => ["param is missing or the value is empty: term"] ) end @@ -605,4 +605,18 @@ RSpec.describe ApplicationController do expect(response.status).to eq(200) expect(response.body).to include('Discourse') end + + it 'has canonical tag' do + get '/', headers: { HTTP_ACCEPT: '*/*' } + expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/" }) + get '/?query_param=true', headers: { HTTP_ACCEPT: '*/*' } + expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/" }) + get '/latest?page=2&additional_param=true', headers: { HTTP_ACCEPT: '*/*' } + expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/latest?page=2" }) + get '/404', headers: { HTTP_ACCEPT: '*/*' } + expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/404" }) + topic = create_post.topic + get "/t/#{topic.slug}/#{topic.id}" + expect(response.body).to have_tag("link", with: { rel: "canonical", href: "http://test.localhost/t/#{topic.slug}/#{topic.id}" }) + end end diff --git a/spec/requests/associate_accounts_controller_spec.rb b/spec/requests/associate_accounts_controller_spec.rb index 8e67b2732e..3b06878f6c 100644 --- a/spec/requests/associate_accounts_controller_spec.rb +++ b/spec/requests/associate_accounts_controller_spec.rb @@ -52,7 +52,7 @@ RSpec.describe Users::AssociateAccountsController do # Request associate info uri = URI.parse(response.redirect_url) get "#{uri.path}.json" - data = JSON.parse(response.body) + data = response.parsed_body expect(data["provider_name"]).to eq("google_oauth2") expect(data["account_description"]).to eq("someemail@test.com") @@ -64,7 +64,7 @@ RSpec.describe Users::AssociateAccountsController do # Back to first user sign_in(user) get "#{uri.path}.json" - data = JSON.parse(response.body) + data = response.parsed_body expect(data["provider_name"]).to eq("google_oauth2") # Make the connection diff --git a/spec/requests/badges_controller_spec.rb b/spec/requests/badges_controller_spec.rb index 777596a4ff..170977f31c 100644 --- a/spec/requests/badges_controller_spec.rb +++ b/spec/requests/badges_controller_spec.rb @@ -15,8 +15,9 @@ describe BadgesController do get "/badges.json" expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["badges"].length).to eq(Badge.enabled.count) + expect(response.headers['X-Robots-Tag']).to eq('noindex') end end @@ -24,7 +25,7 @@ describe BadgesController do it "should return a badge" do get "/badges/#{badge.id}.json" expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["badge"]).to be_present end diff --git a/spec/requests/bookmarks_controller_spec.rb b/spec/requests/bookmarks_controller_spec.rb index 8c29af8707..5ab699f9d0 100644 --- a/spec/requests/bookmarks_controller_spec.rb +++ b/spec/requests/bookmarks_controller_spec.rb @@ -25,7 +25,7 @@ describe BookmarksController do } expect(response.status).to eq(400) - expect(JSON.parse(response.body)['errors']).to include( + expect(response.parsed_body['errors']).to include( I18n.t("bookmarks.errors.already_bookmarked_post") ) end @@ -39,8 +39,8 @@ describe BookmarksController do } expect(response.status).to eq(400) - expect(JSON.parse(response.body)['errors'].first).to include( - I18n.t("bookmarks.errors.time_must_be_provided", reminder_type: I18n.t("bookmarks.reminders.at_desktop")) + expect(response.parsed_body['errors'].first).to include( + I18n.t("bookmarks.errors.time_must_be_provided") ) end end @@ -60,7 +60,7 @@ describe BookmarksController do delete "/bookmarks/#{bookmark.id}.json" expect(response.status).to eq(404) - expect(JSON.parse(response.body)['errors'].first).to include( + expect(response.parsed_body['errors'].first).to include( I18n.t("not_found") ) end @@ -73,7 +73,7 @@ describe BookmarksController do delete "/bookmarks/#{bookmark.id}.json" expect(response.status).to eq(403) - expect(JSON.parse(response.body)['errors'].first).to include( + expect(response.parsed_body['errors'].first).to include( I18n.t("invalid_access") ) end diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb index 97293742d3..a4825fb101 100644 --- a/spec/requests/categories_controller_spec.rb +++ b/spec/requests/categories_controller_spec.rb @@ -11,7 +11,7 @@ describe CategoriesController do it 'web crawler view has correct urls for subfolder install' do set_subfolder "/forum" get '/categories', headers: { 'HTTP_USER_AGENT' => 'Googlebot' } - html = Nokogiri::HTML(response.body) + html = Nokogiri::HTML5(response.body) expect(html.css('body.crawler')).to be_present expect(html.css("a[href=\"/forum/c/#{category.slug}\"]")).to be_present end @@ -129,7 +129,7 @@ describe CategoriesController do } expect(response.status).to eq(422) - expect(JSON.parse(response.body)['errors']).to be_present + expect(response.parsed_body['errors']).to be_present end end @@ -156,7 +156,7 @@ describe CategoriesController do } expect(response.status).to eq(200) - cat_json = ::JSON.parse(response.body)['category'] + cat_json = response.parsed_body['category'] expect(cat_json).to be_present expect(cat_json['reviewable_by_group_name']).to eq(group.name) expect(cat_json['name']).to eq('hello') @@ -497,21 +497,21 @@ describe CategoriesController do SiteSetting.categories_topics = 5 get '/categories_and_latest.json' - expect(JSON.parse(response.body)['topic_list']['topics'].size).to eq(5) + expect(response.parsed_body['topic_list']['topics'].size).to eq(5) end it 'works when SiteSetting.categories_topics is null' do SiteSetting.categories_topics = 0 get '/categories_and_latest.json' - json = JSON.parse(response.body) + json = response.parsed_body expect(json['category_list']['categories'].size).to eq(2) # 'Uncategorized' and category expect(json['topic_list']['topics'].size).to eq(5) Fabricate(:category, parent_category: category) get '/categories_and_latest.json' - json = JSON.parse(response.body) + json = response.parsed_body expect(json['category_list']['categories'].size).to eq(2) expect(json['topic_list']['topics'].size).to eq(5) @@ -519,7 +519,7 @@ describe CategoriesController do Fabricate(:category) get '/categories_and_latest.json' - json = JSON.parse(response.body) + json = response.parsed_body expect(json['category_list']['categories'].size).to eq(4) expect(json['topic_list']['topics'].size).to eq(6) end diff --git a/spec/requests/category_hashtags_controller_spec.rb b/spec/requests/category_hashtags_controller_spec.rb index f055998d84..f2f62a82ea 100644 --- a/spec/requests/category_hashtags_controller_spec.rb +++ b/spec/requests/category_hashtags_controller_spec.rb @@ -17,7 +17,7 @@ describe CategoryHashtagsController do get "/category_hashtags/check.json", params: { category_slugs: [category.slug, 'none'] } expect(response.status).to eq(200) - expect(JSON.parse(response.body)).to eq( + expect(response.parsed_body).to eq( "valid" => [{ "slug" => category.hashtag_slug, "url" => category.url_with_id }] ) end @@ -29,7 +29,7 @@ describe CategoryHashtagsController do get "/category_hashtags/check.json", params: { category_slugs: [private_category.slug] } expect(response.status).to eq(200) - expect(JSON.parse(response.body)).to eq("valid" => []) + expect(response.parsed_body).to eq("valid" => []) end end @@ -44,7 +44,7 @@ describe CategoryHashtagsController do params: { category_slugs: [private_category.slug] } expect(response.status).to eq(200) - expect(JSON.parse(response.body)).to eq( + expect(response.parsed_body).to eq( "valid" => [{ "slug" => private_category.hashtag_slug, "url" => private_category.url_with_id }] ) end diff --git a/spec/requests/composer_messages_controller_spec.rb b/spec/requests/composer_messages_controller_spec.rb index 0654bca1ab..241f931868 100644 --- a/spec/requests/composer_messages_controller_spec.rb +++ b/spec/requests/composer_messages_controller_spec.rb @@ -27,7 +27,7 @@ describe ComposerMessagesController do get "/composer_messages.json", params: args expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["composer_messages"].first["id"]).to eq("reviving_old") end end diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb index 31f416f6d4..73a76e5830 100644 --- a/spec/requests/directory_items_controller_spec.rb +++ b/spec/requests/directory_items_controller_spec.rb @@ -40,7 +40,7 @@ describe DirectoryItemsController do it "succeeds with a valid value" do get '/directory_items.json', params: { period: 'all' } expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json).to be_present expect(json['directory_items']).to be_present @@ -63,7 +63,7 @@ describe DirectoryItemsController do get '/directory_items.json', params: { period: 'all', name: 'eviltrout' } expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json).to be_present expect(json['directory_items'].length).to eq(1) expect(json['meta']['total_rows_directory_items']).to eq(1) @@ -74,7 +74,7 @@ describe DirectoryItemsController do get '/directory_items.json', params: { period: 'all', name: 'stage_user' } expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json).to be_present expect(json['directory_items'].length).to eq(1) expect(json['meta']['total_rows_directory_items']).to eq(1) @@ -85,7 +85,7 @@ describe DirectoryItemsController do get '/directory_items.json', params: { period: 'all', exclude_usernames: "stage_user,eviltrout" } expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json).to be_present expect(json['directory_items'].length).to eq(2) expect(json['meta']['total_rows_directory_items']).to eq(2) @@ -97,7 +97,7 @@ describe DirectoryItemsController do get '/directory_items.json', params: { period: 'all', group: group.name } expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json).to be_present expect(json['directory_items'].length).to eq(2) expect(json['meta']['total_rows_directory_items']).to eq(2) diff --git a/spec/requests/draft_controller_spec.rb b/spec/requests/draft_controller_spec.rb index c84f3fceb3..f828e6d89d 100644 --- a/spec/requests/draft_controller_spec.rb +++ b/spec/requests/draft_controller_spec.rb @@ -22,7 +22,7 @@ describe DraftController do end it "returns 404 when the key is missing" do - user = sign_in(Fabricate(:user)) + _user = sign_in(Fabricate(:user)) post "/draft.json", params: { data: { my: "data" }.to_json, sequence: 0 } expect(response.status).to eq(404) end @@ -33,7 +33,7 @@ describe DraftController do get "/draft.json", params: { draft_key: 'hello' } expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['draft']).to eq('test') get "/draft.json" @@ -54,7 +54,7 @@ describe DraftController do }.to_json } - expect(JSON.parse(response.body)['conflict_user']).to eq(nil) + expect(response.parsed_body['conflict_user']).to eq(nil) post "/draft.json", params: { draft_key: "topic", @@ -66,7 +66,7 @@ describe DraftController do }.to_json } - json = JSON.parse(response.body) + json = response.parsed_body expect(json['conflict_user']['id']).to eq(post.last_editor.id) expect(json['conflict_user']).to include('avatar_template') @@ -94,7 +94,7 @@ describe DraftController do } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["draft_sequence"]).to eq(1) end @@ -110,7 +110,7 @@ describe DraftController do expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["draft_sequence"]).to eq(0) post "/draft.json", params: { @@ -121,7 +121,7 @@ describe DraftController do } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["draft_sequence"]).to eq(1) expect(DraftSequence.current(user, "abc")).to eq(1) @@ -134,19 +134,19 @@ describe DraftController do } expect(response.status).to eq(200) - json = JSON.parse(response.body) - expect(json["draft_sequence"]).to eq(1) + json = response.parsed_body + expect(json["draft_sequence"]).to eq(2) post "/draft.json", params: { draft_key: "abc", - sequence: 1, + sequence: 2, data: { c: "test" }.to_json, owner: "abc" } expect(response.status).to eq(200) - json = JSON.parse(response.body) - expect(json["draft_sequence"]).to eq(2) + json = response.parsed_body + expect(json["draft_sequence"]).to eq(3) end it 'raises an error for out-of-sequence draft setting' do diff --git a/spec/requests/drafts_controller_spec.rb b/spec/requests/drafts_controller_spec.rb index d67d32828c..0ce0be8663 100644 --- a/spec/requests/drafts_controller_spec.rb +++ b/spec/requests/drafts_controller_spec.rb @@ -13,7 +13,7 @@ describe DraftsController do Draft.set(user, 'xxx', 0, '{}') get "/drafts.json", params: { username: user.username } expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["drafts"].length).to eq(1) end @@ -23,7 +23,7 @@ describe DraftsController do Draft.clear(user, 'xxx', 0) get "/drafts.json", params: { username: user.username } expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["drafts"].length).to eq(0) end @@ -45,13 +45,13 @@ describe DraftsController do sign_in(topic_user) get "/drafts.json", params: { username: topic_user.username } expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["drafts"].first["title"]).to eq(topic.title) sign_in(other_user) get "/drafts.json", params: { username: other_user.username } expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["drafts"].first["title"]).to eq(nil) end end diff --git a/spec/requests/email_controller_spec.rb b/spec/requests/email_controller_spec.rb index 10658907b6..ec60265f66 100644 --- a/spec/requests/email_controller_spec.rb +++ b/spec/requests/email_controller_spec.rb @@ -231,7 +231,7 @@ RSpec.describe EmailController do navigate_to_unsubscribe - source = Nokogiri::HTML::fragment(response.body) + source = Nokogiri::HTML5::fragment(response.body) expect(source.css(".combobox option").map(&:inner_text)).to eq(slow_digest_frequencies) end @@ -242,7 +242,7 @@ RSpec.describe EmailController do navigate_to_unsubscribe - source = Nokogiri::HTML::fragment(response.body) + source = Nokogiri::HTML5::fragment(response.body) expect(source.css(".combobox option[selected='selected']")[0]['value']).to eq(six_months_freq.to_s) end @@ -253,7 +253,7 @@ RSpec.describe EmailController do navigate_to_unsubscribe - source = Nokogiri::HTML::fragment(response.body) + source = Nokogiri::HTML5::fragment(response.body) expect(source.css(".combobox option[selected='selected']")[0]['value']).to eq(never_frequency.to_s) end end diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb index 71d6eef807..62e42b1d81 100644 --- a/spec/requests/embed_controller_spec.rb +++ b/spec/requests/embed_controller_spec.rb @@ -52,7 +52,7 @@ describe EmbedController do params: { embed_url: topic_embed.embed_url }, headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: "system" } - json = JSON.parse(response.body) + json = response.parsed_body expect(json['topic_id']).to eq(topic_embed.topic.id) expect(json['post_id']).to eq(topic_embed.post.id) expect(json['topic_slug']).to eq(topic_embed.topic.slug) @@ -65,7 +65,7 @@ describe EmbedController do params: { embed_url: "http://nope.com" }, headers: { HTTP_API_KEY: api_key.key, HTTP_API_USERNAME: "system" } - json = JSON.parse(response.body) + json = response.parsed_body expect(json["error_type"]).to eq("not_found") end end @@ -146,7 +146,7 @@ describe EmbedController do get '/embed/comments', params: { embed_url: embed_url }, headers: headers - html = Nokogiri::HTML.fragment(response.body) + html = Nokogiri::HTML5.fragment(response.body) css_link = html.at("link[data-target=embedded_theme]").attribute("href").value get css_link diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb index 5edf1bcb6f..11eb7eb0e4 100644 --- a/spec/requests/groups_controller_spec.rb +++ b/spec/requests/groups_controller_spec.rb @@ -22,7 +22,7 @@ describe GroupsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["groups"].size).to eq(36) expect(body["total_rows_groups"]).to eq(50) @@ -32,7 +32,7 @@ describe GroupsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["groups"].size).to eq(14) expect(body["total_rows_groups"]).to eq(50) @@ -79,7 +79,7 @@ describe GroupsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["groups"].first["id"]).to eq(testing_group.id) expect(body["load_more_groups"]).to eq("/groups?filter=test&page=1") @@ -100,7 +100,7 @@ describe GroupsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["groups"].map { |g| g["id"] }).to eq([ other_group.id, group.id, moderator_group_id @@ -114,7 +114,7 @@ describe GroupsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["groups"].map { |g| g["id"] }).to eq([ other_group.id, group.id, moderator_group_id @@ -130,7 +130,7 @@ describe GroupsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["groups"].map { |g| g["id"] }).to eq([ moderator_group_id, group.id, other_group.id @@ -144,7 +144,7 @@ describe GroupsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["groups"].map { |g| g["id"] }).to eq([ moderator_group_id, group.id, other_group.id @@ -163,7 +163,7 @@ describe GroupsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body group_ids = body["groups"].map { |g| g["id"] } @@ -209,7 +209,7 @@ describe GroupsController do get "/groups.json", params: { username: u.username } expect(response.status).to eq(200) - group_names = JSON.parse(response.body)["groups"].map { |g| g["name"] } + group_names = response.parsed_body["groups"].map { |g| g["name"] } expect(group_names).to contain_exactly("0_0") # logged in user @@ -217,7 +217,7 @@ describe GroupsController do get "/groups.json", params: { username: u.username } expect(response.status).to eq(200) - group_names = JSON.parse(response.body)["groups"].map { |g| g["name"] } + group_names = response.parsed_body["groups"].map { |g| g["name"] } expect(group_names).to contain_exactly("0_0", "0_1", "1_0", "1_1") # member of the group @@ -225,7 +225,7 @@ describe GroupsController do get "/groups.json", params: { username: u.username } expect(response.status).to eq(200) - group_names = JSON.parse(response.body)["groups"].map { |g| g["name"] } + group_names = response.parsed_body["groups"].map { |g| g["name"] } expect(group_names).to contain_exactly("0_0", "0_1", "0_2", "1_0", "1_1", "1_2", "2_0", "2_1", "2_2") # owner @@ -233,7 +233,7 @@ describe GroupsController do get "/groups.json", params: { username: u.username } expect(response.status).to eq(200) - group_names = JSON.parse(response.body)["groups"].map { |g| g["name"] } + group_names = response.parsed_body["groups"].map { |g| g["name"] } expect(group_names).to contain_exactly("0_0", "0_1", "0_4", "1_0", "1_1", "1_4", "2_4", "3_4", "4_0", "4_1", "4_2", "4_3", "4_4") # moderator @@ -241,7 +241,7 @@ describe GroupsController do get "/groups.json", params: { username: u.username } expect(response.status).to eq(200) - group_names = JSON.parse(response.body)["groups"].map { |g| g["name"] } + group_names = response.parsed_body["groups"].map { |g| g["name"] } expect(group_names).to contain_exactly("0_0", "0_1", "0_3", "1_0", "1_1", "1_3", "3_0", "3_1", "3_3") # admin @@ -249,7 +249,7 @@ describe GroupsController do get "/groups.json", params: { username: u.username } expect(response.status).to eq(200) - group_names = JSON.parse(response.body)["groups"].map { |g| g["name"] } + group_names = response.parsed_body["groups"].map { |g| g["name"] } all_group_names = levels.product(levels).map { |a, b| "#{a}_#{b}" } expect(group_names).to contain_exactly(*all_group_names) end @@ -270,7 +270,7 @@ describe GroupsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body group_ids = body["groups"].map { |g| g["id"] } group_body = body["groups"].find { |g| g["id"] == group.id } @@ -292,7 +292,7 @@ describe GroupsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body group_ids = body["groups"].map { |g| g["id"] } expect(body["total_rows_groups"]).to eq(expected_group_ids.count) @@ -360,10 +360,11 @@ describe GroupsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body['group']['id']).to eq(group.id) expect(body['extras']["visible_group_names"]).to eq([group.name]) + expect(response.headers['X-Robots-Tag']).to eq('noindex') end context 'as an admin' do @@ -373,7 +374,7 @@ describe GroupsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body['group']['id']).to eq(group.id) @@ -409,7 +410,7 @@ describe GroupsController do expect(response.status).to eq(200) - body = JSON.parse(response.body)['group'] + body = response.parsed_body['group'] expect(body["id"]).to eq(group.id) end @@ -441,7 +442,7 @@ describe GroupsController do get "/groups/#{group.name}/posts.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body).first["id"]).to eq(post.id) + expect(response.parsed_body.first["id"]).to eq(post.id) end end @@ -488,24 +489,24 @@ describe GroupsController do 4.times { group.add(Fabricate(:user)) } usernames = group.users.map { |m| m.username }.sort - get "/groups/#{group.name}/members.json", params: { limit: 3 } + get "/groups/#{group.name}/members.json", params: { limit: 3, asc: true } expect(response.status).to eq(200) - members = JSON.parse(response.body)["members"] + members = response.parsed_body["members"] expect(members.map { |m| m['username'] }).to eq(usernames[0..2]) - get "/groups/#{group.name}/members.json", params: { limit: 3, offset: 3 } + get "/groups/#{group.name}/members.json", params: { limit: 3, offset: 3, asc: true } expect(response.status).to eq(200) - members = JSON.parse(response.body)["members"] + members = response.parsed_body["members"] expect(members.map { |m| m['username'] }).to eq(usernames[3..5]) - get "/groups/#{group.name}/members.json", params: { order: 'added_at', desc: true } - members = JSON.parse(response.body)["members"] + get "/groups/#{group.name}/members.json", params: { order: 'added_at' } + members = response.parsed_body["members"] expect(members.last['added_at']).to eq(first_user.created_at.as_json) end @@ -549,7 +550,7 @@ describe GroupsController do get "/groups/#{group.name}/mentionable.json" expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["mentionable"]).to eq(false) group.update!( @@ -560,7 +561,7 @@ describe GroupsController do get "/groups/#{group.name}/mentionable.json" expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["mentionable"]).to eq(true) group.update!( @@ -571,7 +572,7 @@ describe GroupsController do get "/groups/#{group.name}/mentionable.json" expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["mentionable"]).to eq(true) end end @@ -583,7 +584,7 @@ describe GroupsController do get "/groups/#{group.name}/messageable.json" expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["messageable"]).to eq(false) group.update!( @@ -594,7 +595,7 @@ describe GroupsController do get "/groups/#{group.name}/messageable.json" expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["messageable"]).to eq(true) end end @@ -619,7 +620,7 @@ describe GroupsController do end after do - Group.plugin_editable_group_custom_fields.clear + DiscoursePluginRegistry.reset! end it "only updates allowed user fields" do @@ -633,7 +634,7 @@ describe GroupsController do end it "is secure when there are no registered editable fields" do - Group.plugin_editable_group_custom_fields.clear + DiscoursePluginRegistry.reset! put "/groups/#{@group.id}.json", params: { group: { custom_fields: { test: :hello1, test2: :hello2 } } } @group.reload @@ -673,7 +674,7 @@ describe GroupsController do incoming_email: 'test@mail.org', flair_bg_color: 'FFF', flair_color: 'BBB', - flair_url: 'fa-adjust', + flair_icon: 'fa-adjust', bio_raw: 'testing', full_name: 'awesome team', public_admission: true, @@ -850,30 +851,30 @@ describe GroupsController do it "should allow members to be sorted by" do get "/groups/#{group.name}/members.json", params: { - order: 'last_seen_at', desc: true + order: 'last_seen_at' } expect(response.status).to eq(200) - members = JSON.parse(response.body)["members"] + members = response.parsed_body["members"] expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id, user3.id]) - get "/groups/#{group.name}/members.json", params: { order: 'last_seen_at' } + get "/groups/#{group.name}/members.json", params: { order: 'last_seen_at', asc: true } expect(response.status).to eq(200) - members = JSON.parse(response.body)["members"] + members = response.parsed_body["members"] expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id, user3.id]) get "/groups/#{group.name}/members.json", params: { - order: 'last_posted_at', desc: true + order: 'last_posted_at' } expect(response.status).to eq(200) - members = JSON.parse(response.body)["members"] + members = response.parsed_body["members"] expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id, user3.id]) end @@ -883,7 +884,7 @@ describe GroupsController do expect(response.status).to eq(200) - members = JSON.parse(response.body)["members"] + members = response.parsed_body["members"] expect(members.map { |m| m["id"] }) .to contain_exactly(user1.id, user2.id, user3.id) @@ -897,7 +898,7 @@ describe GroupsController do get "/groups/#{group.name}/members.json", params: { requesters: true } - members = JSON.parse(response.body)["members"] + members = response.parsed_body["members"] expect(members.length).to eq(1) expect(members.first["username"]).to eq(user4.username) expect(members.first["reason"]).to eq(request4.reason) @@ -912,7 +913,7 @@ describe GroupsController do get "/groups/#{group.name}/members.json", params: { filter: email } expect(response.status).to eq(200) - members = JSON.parse(response.body)["members"] + members = response.parsed_body["members"] expect(members).to eq([]) end end @@ -934,7 +935,7 @@ describe GroupsController do get "/groups/#{group.name}/members.json", params: { filter: filter } expect(response.status).to eq(200) - members = JSON.parse(response.body)["members"] + members = response.parsed_body["members"] expect(members.map { |m| m["id"] }).to contain_exactly(*ids) end end @@ -947,7 +948,7 @@ describe GroupsController do get "/groups/#{group.name}/members.json", params: { filter: filter } expect(response.status).to eq(200) - members = JSON.parse(response.body)["members"] + members = response.parsed_body["members"] expect(members.map { |m| m["id"] }).to contain_exactly(user1.id) end end @@ -1089,7 +1090,7 @@ describe GroupsController do expect(response.status).to eq(422) - expect(JSON.parse(response.body)["errors"]).to include(I18n.t( + expect(response.parsed_body["errors"]).to include(I18n.t( "groups.errors.member_already_exist", username: "alice, bob", count: 2 @@ -1102,7 +1103,7 @@ describe GroupsController do expect(response.status).to eq(422) - expect(JSON.parse(response.body)["errors"]).to include(I18n.t( + expect(response.parsed_body["errors"]).to include(I18n.t( "groups.errors.member_already_exist", username: user.username, count: 1 @@ -1119,7 +1120,7 @@ describe GroupsController do expect(response.status).to eq(400) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["error_type"]).to eq("invalid_parameters") end @@ -1324,6 +1325,25 @@ describe GroupsController do end end + describe "#handle_membership_request" do + before do + group.add_owner(user) + sign_in(user) + end + + it "sends a private message when accepted" do + group_request = GroupRequest.create!(group: group, user: other_user) + expect { put "/groups/#{group.id}/handle_membership_request.json", params: { user_id: other_user.id, accept: true } } + .to change { Topic.count }.by(1) + .and change { Post.count }.by(1) + + topic = Topic.last + expect(topic.archetype).to eq(Archetype.private_message) + expect(topic.title).to eq(I18n.t('groups.request_accepted_pm.title', group_name: group.name)) + expect(topic.first_post.raw).to eq(I18n.t('groups.request_accepted_pm.body', group_name: group.name).strip) + end + end + describe "#histories" do context 'when user is not signed in' do it 'should raise the right error' do @@ -1365,7 +1385,7 @@ describe GroupsController do expect(response.status).to eq(200) - result = JSON.parse(response.body)["logs"].find { |entry| entry["subject"] == "public_exit" } + result = response.parsed_body["logs"].find { |entry| entry["subject"] == "public_exit" } expect(result["action"]).to eq(GroupHistory.actions[1].to_s) expect(result["subject"]).to eq('public_exit') @@ -1397,7 +1417,7 @@ describe GroupsController do expect(response.status).to eq(200) - result = JSON.parse(response.body)["logs"].first + result = response.parsed_body["logs"].first expect(result["action"]).to eq(GroupHistory.actions[3].to_s) end @@ -1420,7 +1440,7 @@ describe GroupsController do expect(response.status).to eq(200) - logs = JSON.parse(response.body)["logs"] + logs = response.parsed_body["logs"] expect(logs.count).to eq(1) expect(logs.first["action"]).to eq(GroupHistory.actions[2].to_s) @@ -1471,7 +1491,7 @@ describe GroupsController do post = Post.last topic = post.topic - body = JSON.parse(response.body) + body = response.parsed_body expect(body['relative_url']).to eq(topic.relative_url) expect(post.topic.custom_fields['requested_group_id'].to_i).to eq(group.id) @@ -1520,7 +1540,7 @@ describe GroupsController do get '/groups/search.json' expect(response.status).to eq(200) - groups = JSON.parse(response.body) + groups = response.parsed_body expected_ids = Group::AUTO_GROUPS.map { |name, id| id } expected_ids.delete(Group::AUTO_GROUPS[:everyone]) @@ -1532,7 +1552,7 @@ describe GroupsController do get "/groups/search.json?term=#{term}" expect(response.status).to eq(200) - groups = JSON.parse(response.body) + groups = response.parsed_body expect(groups.length).to eq(1) expect(groups.first['id']).to eq(group.id) @@ -1541,7 +1561,7 @@ describe GroupsController do get "/groups/search.json?term=KingOfTheNorth" expect(response.status).to eq(200) - groups = JSON.parse(response.body) + groups = response.parsed_body expect(groups).to eq([]) end @@ -1558,7 +1578,7 @@ describe GroupsController do get "/groups/search.json?term=north" expect(response.status).to eq(200) - groups = JSON.parse(response.body) + groups = response.parsed_body expect(groups.length).to eq(1) expect(groups.first['id']).to eq(hidden_group.id) @@ -1572,7 +1592,7 @@ describe GroupsController do get '/groups/search.json?ignore_automatic=true' expect(response.status).to eq(200) - groups = JSON.parse(response.body) + groups = response.parsed_body expect(groups.length).to eq(2) @@ -1626,7 +1646,7 @@ describe GroupsController do get "/groups/check-name.json", params: { group_name: 'test' } expect(response.status).to eq(200) - expect(JSON.parse(response.body)["available"]).to eq(true) + expect(response.parsed_body["available"]).to eq(true) end end end diff --git a/spec/requests/inline_onebox_controller_spec.rb b/spec/requests/inline_onebox_controller_spec.rb index 1a29e75275..8aed821fef 100644 --- a/spec/requests/inline_onebox_controller_spec.rb +++ b/spec/requests/inline_onebox_controller_spec.rb @@ -15,7 +15,7 @@ describe InlineOneboxController do it "returns empty JSON for empty input" do get "/inline-onebox.json", params: { urls: [] } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['inline-oneboxes']).to eq([]) end @@ -25,7 +25,7 @@ describe InlineOneboxController do it "returns information for a valid link" do get "/inline-onebox.json", params: { urls: [ topic.url ] } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body onebox = json['inline-oneboxes'][0] expect(onebox).to be_present diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb index 8af1c741ea..5e2bf32aa3 100644 --- a/spec/requests/invites_controller_spec.rb +++ b/spec/requests/invites_controller_spec.rb @@ -94,7 +94,7 @@ describe InvitesController do invite = Invite.invite_by_email("invite@example.com", user) post "/invites.json", params: { email: invite.email } expect(response.status).to eq(422) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["failed"]).to be_present end @@ -129,7 +129,7 @@ describe InvitesController do sign_in(Fabricate(:admin)) post "/invites.json", params: { email: "test@mailinator.com" } expect(response.status).to eq(422) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["errors"]).to be_present end end @@ -208,7 +208,7 @@ describe InvitesController do it "redirects to the root and doesn't change the session" do put "/invites/show/doesntexist.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["success"]).to eq(false) expect(json["message"]).to eq(I18n.t('invite.not_found_json')) expect(session[:current_user_id]).to be_blank @@ -221,7 +221,7 @@ describe InvitesController do invite.update_attribute(:email, "John Doe ") put "/invites/show/#{invite.invite_key}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["success"]).to eq(false) expect(json["message"]).to eq(I18n.t('invite.error_message')) expect(session[:current_user_id]).to be_blank @@ -243,7 +243,7 @@ describe InvitesController do put "/invites/show/#{invite.invite_key}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["success"]).to eq(false) expect(json["message"]).to eq(I18n.t('invite.not_found_json')) expect(session[:current_user_id]).to be_blank @@ -286,7 +286,7 @@ describe InvitesController do it 'redirects to the first topic the user was invited to' do put "/invites/show/#{invite.invite_key}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["success"]).to eq(true) expect(json["redirect_to"]).to eq(topic.relative_url) end @@ -306,7 +306,7 @@ describe InvitesController do it "doesn't log in the user if there's a validation error" do put "/invites/show/#{invite.invite_key}.json", params: { password: "password" } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["success"]).to eq(false) expect(json["errors"]["password"]).to be_present end @@ -317,7 +317,7 @@ describe InvitesController do user.send_welcome_message = true put "/invites/show/#{invite.invite_key}.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body)["success"]).to eq(true) + expect(response.parsed_body["success"]).to eq(true) expect(Jobs::SendSystemMessage.jobs.size).to eq(1) end @@ -371,7 +371,7 @@ describe InvitesController do end.to change { UserAuthToken.count }.by(1) expect(response.status).to eq(200) - expect(JSON.parse(response.body)["success"]).to eq(true) + expect(response.parsed_body["success"]).to eq(true) expect(Jobs::InvitePasswordInstructionsEmail.jobs.size).to eq(0) expect(Jobs::CriticalUserEmail.jobs.size).to eq(0) @@ -391,8 +391,8 @@ describe InvitesController do end.not_to change { UserAuthToken.count } expect(response.status).to eq(200) - expect(JSON.parse(response.body)["success"]).to eq(true) - expect(JSON.parse(response.body)["message"]).to eq(I18n.t("invite.confirm_email")) + expect(response.parsed_body["success"]).to eq(true) + expect(response.parsed_body["message"]).to eq(I18n.t("invite.confirm_email")) invited_user = User.find_by_email(invite.email) expect(invited_user.active).to eq(false) @@ -526,7 +526,7 @@ describe InvitesController do expect(response.status).to eq(422) expect(Jobs::BulkInvite.jobs.size).to eq(1) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["errors"][0]).to eq(I18n.t("bulk_invite.max_rows", max_bulk_invites: SiteSetting.max_bulk_invites)) end end diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb index 38daebea59..bc913c58a0 100644 --- a/spec/requests/list_controller_spec.rb +++ b/spec/requests/list_controller_spec.rb @@ -68,7 +68,7 @@ RSpec.describe ListController do get "/latest.json", params: { topic_ids: "#{p.topic_id}" } expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["topic_list"]["topics"].length).to eq(1) end @@ -90,11 +90,11 @@ RSpec.describe ListController do TopTopic.refresh! get "/categories_and_top.json" - data = JSON.parse(response.body) + data = response.parsed_body expect(data["topic_list"]["topics"].length).to eq(1) get "/categories_and_latest.json" - data = JSON.parse(response.body) + data = response.parsed_body expect(data["topic_list"]["topics"].length).to eq(2) end end @@ -128,7 +128,7 @@ RSpec.describe ListController do let(:moderator) { Fabricate(:moderator) } let(:admin) { Fabricate(:admin) } let(:tag) { Fabricate(:tag) } - let(:private_message) { Fabricate(:private_message_topic) } + let(:private_message) { Fabricate(:private_message_topic, user: admin) } before do SiteSetting.tagging_enabled = true @@ -149,6 +149,17 @@ RSpec.describe ListController do expect(response.status).to eq(200) end end + + it 'should work for tag with unicode name' do + unicode_tag = Fabricate(:tag, name: 'hello-🇺🇸') + Fabricate(:topic_tag, tag: unicode_tag, topic: private_message) + + sign_in(admin) + get "/topics/private-messages-tags/#{admin.username}/#{UrlHelper.encode_component(unicode_tag.name)}.json" + expect(response.status).to eq(200) + expect(response.parsed_body["topic_list"]["topics"].first["id"]) + .to eq(private_message.id) + end end describe '#private_messages_group' do @@ -169,7 +180,7 @@ RSpec.describe ListController do expect(response.status).to eq(200) - expect(JSON.parse(response.body)["topic_list"]["topics"].first["id"]) + expect(response.parsed_body["topic_list"]["topics"].first["id"]) .to eq(topic.id) end end @@ -184,7 +195,7 @@ RSpec.describe ListController do get "/topics/private-messages-group/#{user.username}/#{UrlHelper.encode_component(unicode_group.name)}.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body)["topic_list"]["topics"].first["id"]) + expect(response.parsed_body["topic_list"]["topics"].first["id"]) .to eq(topic.id) end end @@ -217,7 +228,7 @@ RSpec.describe ListController do get "/topics/groups/#{group.name}.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body)["topic_list"]).to be_present + expect(response.parsed_body["topic_list"]).to be_present end end @@ -286,7 +297,7 @@ RSpec.describe ListController do expect(response.status).to eq(200) - topics = JSON.parse(response.body)["topic_list"]["topics"] + topics = response.parsed_body["topic_list"]["topics"] expect(topics.map { |topic| topic["id"] }).to contain_exactly( topic.id, topic2.id @@ -384,7 +395,7 @@ RSpec.describe ListController do it 'uses the correct category' do get "/c/#{other_category.slug}/l/latest.json" expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["topic_list"]["topics"].first["category_id"]) .to eq(other_category.id) end @@ -429,7 +440,7 @@ RSpec.describe ListController do category.update!(default_view: 'top', default_top_period: 'monthly') get "/c/#{category.slug}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["topic_list"]["for_period"]).to eq("monthly") end @@ -437,7 +448,7 @@ RSpec.describe ListController do category.update!(default_view: nil) get "/c/#{category.slug}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["topic_list"]["for_period"]).to be_blank end @@ -445,7 +456,7 @@ RSpec.describe ListController do category.update!(default_view: '') get "/c/#{category.slug}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["topic_list"]["for_period"]).to be_blank end @@ -453,7 +464,7 @@ RSpec.describe ListController do category.update!(default_view: 'latest') get "/c/#{category.slug}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["topic_list"]["for_period"]).to be_blank end end @@ -502,7 +513,7 @@ RSpec.describe ListController do it "should respond with a list" do get "/topics/created-by/#{user.username}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["topic_list"]["topics"].size).to eq(2) end @@ -510,7 +521,7 @@ RSpec.describe ListController do user.update!(username: "myname.test") get "/topics/created-by/#{user.username}", xhr: true expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["topic_list"]["topics"].size).to eq(2) end end @@ -528,7 +539,7 @@ RSpec.describe ListController do sign_in(user) get "/topics/private-messages/#{user.username}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["topic_list"]["topics"].size).to eq(1) end end @@ -549,7 +560,7 @@ RSpec.describe ListController do sign_in(user) get "/topics/private-messages-sent/#{user.username}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["topic_list"]["topics"].size).to eq(1) end end @@ -572,7 +583,7 @@ RSpec.describe ListController do sign_in(user) get "/topics/private-messages-unread/#{user.username}.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["topic_list"]["topics"].size).to eq(1) end end diff --git a/spec/requests/metadata_controller_spec.rb b/spec/requests/metadata_controller_spec.rb index 4e00f5a1c6..ae8166428b 100644 --- a/spec/requests/metadata_controller_spec.rb +++ b/spec/requests/metadata_controller_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true +# rubocop:disable Discourse/NoJsonParseResponse require 'rails_helper' @@ -85,6 +86,14 @@ RSpec.describe MetadataController do manifest = JSON.parse(response.body) expect(manifest["short_name"]).to eq("foo") end + + it 'contains valid shortcuts by default' do + get "/manifest.webmanifest" + expect(response.status).to eq(200) + manifest = JSON.parse(response.body) + expect(manifest["shortcuts"].size).to be > 0 + expect { URI.parse(manifest["shortcuts"][0]["icons"][0]["src"]) }.not_to raise_error + end end describe 'opensearch.xml' do diff --git a/spec/requests/notifications_controller_spec.rb b/spec/requests/notifications_controller_spec.rb index 4db535fa18..bb3c9022a3 100644 --- a/spec/requests/notifications_controller_spec.rb +++ b/spec/requests/notifications_controller_spec.rb @@ -125,14 +125,14 @@ describe NotificationsController do describe '#create' do it "can create notification" do create_notification(admin.id, 200, :to_not) - expect(::JSON.parse(response.body)["id"]).to_not eq(nil) + expect(response.parsed_body["id"]).to_not eq(nil) end end describe '#update' do it "can update notification" do update_notification(8, 200, :to) - expect(::JSON.parse(response.body)["topic_id"]).to eq(8) + expect(response.parsed_body["topic_id"]).to eq(8) end end diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb index e604a89aba..78a82e51f5 100644 --- a/spec/requests/omniauth_callbacks_controller_spec.rb +++ b/spec/requests/omniauth_callbacks_controller_spec.rb @@ -141,7 +141,7 @@ RSpec.describe Users::OmniauthCallbacksController do expect(response.location).to include("/auth/failure?message=csrf_detected") get "/session/csrf.json" - token = JSON.parse(response.body)["csrf"] + token = response.parsed_body["csrf"] post "/auth/google_oauth2", params: { authenticity_token: token } expect(response.status).to eq(302) diff --git a/spec/requests/post_actions_controller_spec.rb b/spec/requests/post_actions_controller_spec.rb index e8ed8a5b7d..f2b8d60dd8 100644 --- a/spec/requests/post_actions_controller_spec.rb +++ b/spec/requests/post_actions_controller_spec.rb @@ -108,7 +108,7 @@ RSpec.describe PostActionsController do expect(response.status).to eq(422) - expect(JSON.parse(response.body)["errors"].first).to eq(I18n.t( + expect(response.parsed_body["errors"].first).to eq(I18n.t( :not_accepting_pms, username: user2.username )) end diff --git a/spec/requests/post_readers_controller_spec.rb b/spec/requests/post_readers_controller_spec.rb index 0c56966bc3..4916f54cac 100644 --- a/spec/requests/post_readers_controller_spec.rb +++ b/spec/requests/post_readers_controller_spec.rb @@ -25,7 +25,7 @@ describe PostReadersController do it 'returns an empty list when nobody has read the topic' do get '/post_readers.json', params: { id: @post.id } - readers = JSON.parse(response.body)['post_readers'] + readers = response.parsed_body['post_readers'] expect(readers).to be_empty end @@ -34,7 +34,7 @@ describe PostReadersController do TopicUser.create!(user: reader, topic: @group_message, last_read_post_number: 3) get '/post_readers.json', params: { id: @post.id } - reader_data = JSON.parse(response.body)['post_readers'].first + reader_data = response.parsed_body['post_readers'].first assert_reader_is_correctly_serialized(reader_data, reader, @post) end @@ -43,7 +43,7 @@ describe PostReadersController do TopicUser.create!(user: reader, topic: @group_message, last_read_post_number: 4) get '/post_readers.json', params: { id: @post.id } - reader_data = JSON.parse(response.body)['post_readers'].first + reader_data = response.parsed_body['post_readers'].first assert_reader_is_correctly_serialized(reader_data, reader, @post) end @@ -52,7 +52,7 @@ describe PostReadersController do TopicUser.create!(user: reader, topic: @group_message, last_read_post_number: 1) get '/post_readers.json', params: { id: @post.id } - readers = JSON.parse(response.body)['post_readers'] + readers = response.parsed_body['post_readers'] expect(readers).to be_empty end @@ -62,7 +62,7 @@ describe PostReadersController do TopicUser.create!(user: reader, topic: @group_message, last_read_post_number: nil) get '/post_readers.json', params: { id: @post.id } - readers = JSON.parse(response.body)['post_readers'] + readers = response.parsed_body['post_readers'] expect(readers).to be_empty end @@ -72,7 +72,7 @@ describe PostReadersController do reader.update(staged: true) get '/post_readers.json', params: { id: @post.id } - readers = JSON.parse(response.body)['post_readers'] + readers = response.parsed_body['post_readers'] expect(readers).to be_empty end @@ -83,7 +83,7 @@ describe PostReadersController do TopicUser.create!(user: non_staff_user, topic: @group_message, last_read_post_number: 4) get '/post_readers.json', params: { id: @post.id } - readers = JSON.parse(response.body)['post_readers'] + readers = response.parsed_body['post_readers'] expect(readers).to be_empty end @@ -94,7 +94,7 @@ describe PostReadersController do TopicUser.create!(user: admin, topic: @group_message, last_read_post_number: 4) get '/post_readers.json', params: { id: @post.id } - reader_data = JSON.parse(response.body)['post_readers'].first + reader_data = response.parsed_body['post_readers'].first assert_reader_is_correctly_serialized(reader_data, admin, @post) end @@ -103,7 +103,7 @@ describe PostReadersController do TopicUser.create!(user: Discourse.system_user, topic: @group_message, last_read_post_number: 4) get '/post_readers.json', params: { id: @post.id } - readers = JSON.parse(response.body)['post_readers'] + readers = response.parsed_body['post_readers'] expect(readers).to be_empty end diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb index af25d9c000..910cb5b95d 100644 --- a/spec/requests/posts_controller_spec.rb +++ b/spec/requests/posts_controller_spec.rb @@ -81,7 +81,7 @@ describe PostsController do new_post = create_post get "/posts/#{new_post.id}.json" - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["topic_slug"]).to eq(new_post.topic.slug) expect(parsed["moderator"]).to eq(false) @@ -107,7 +107,7 @@ describe PostsController do _third_post = Fabricate(:post, topic: first_post.topic, created_at: 3.days.ago) get "/posts/by-date/#{second_post.topic_id}/#{(second_post.created_at - 2.days).strftime("%Y-%m-%d")}.json" - json = JSON.parse(response.body) + json = response.parsed_body expect(response.status).to eq(200) expect(json["id"]).to eq(second_post.id) @@ -115,7 +115,7 @@ describe PostsController do it 'returns no post if date is > at last created post' do get "/posts/by-date/#{post.topic_id}/2245-11-11.json" - _json = JSON.parse(response.body) + _json = response.parsed_body expect(response.status).to eq(404) end end @@ -135,7 +135,7 @@ describe PostsController do get "/posts/#{child.id}/reply-history.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json[0]['id']).to eq(parent.id) expect(json[0]['user_custom_fields']['hello']).to eq('world') expect(json[0]['user_custom_fields']['hidden']).to be_blank @@ -158,7 +158,7 @@ describe PostsController do get "/posts/#{parent.id}/replies.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json[0]['id']).to eq(child.id) expect(json[0]['user_custom_fields']['hello']).to eq('world') expect(json[0]['user_custom_fields']['hidden']).to be_blank @@ -324,7 +324,7 @@ describe PostsController do put "/posts/#{post.id}.json", params: update_params expect(response.status).to eq(422) - expect(JSON.parse(response.body)['errors']).to include(I18n.t('too_late_to_edit')) + expect(response.parsed_body['errors']).to include(I18n.t('too_late_to_edit')) end it 'does not allow TL2 to update when edit time limit expired' do @@ -338,7 +338,7 @@ describe PostsController do put "/posts/#{post.id}.json", params: update_params expect(response.status).to eq(422) - expect(JSON.parse(response.body)['errors']).to include(I18n.t('too_late_to_edit')) + expect(response.parsed_body['errors']).to include(I18n.t('too_late_to_edit')) end it 'passes the image sizes through' do @@ -477,7 +477,7 @@ describe PostsController do end it "marks topic_bookmaked as true" do delete "/posts/#{post.id}/bookmark.json" - expect(JSON.parse(response.body)['topic_bookmarked']).to eq(true) + expect(response.parsed_body['topic_bookmarked']).to eq(true) end end end @@ -671,10 +671,21 @@ describe PostsController do expect(response.status).to eq(400) - expect(JSON.parse(response.body)["errors"]).to include( + expect(response.parsed_body["errors"]).to include( I18n.t("invalid_params", message: "category") ) end + + it 'will raise an error if specified embed_url is invalid' do + user = Fabricate(:admin) + master_key = Fabricate(:api_key).key + + post "/posts.json", + params: { title: 'this is a test title', raw: 'this is test body', embed_url: '/test.txt' }, + headers: { HTTP_API_USERNAME: user.username, HTTP_API_KEY: master_key } + + expect(response.status).to eq(422) + end end describe "when logged in" do @@ -698,7 +709,7 @@ describe PostsController do } expect(response.status).to eq(200) - parsed = ::JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["action"]).to eq("enqueued") @@ -737,7 +748,7 @@ describe PostsController do } expect(response.status).to eq(200) - parsed = ::JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["action"]).not_to be_present @@ -756,7 +767,7 @@ describe PostsController do } expect(response).not_to be_successful - parsed = ::JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["action"]).not_to eq("enqueued") end @@ -769,7 +780,7 @@ describe PostsController do } expect(response).not_to be_successful - parsed = ::JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["action"]).not_to eq("enqueued") end end @@ -783,7 +794,7 @@ describe PostsController do } expect(response.status).to eq(200) - parsed = ::JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["action"]).to eq("enqueued") reviewable = ReviewableQueuedPost.find_by(created_by: user) @@ -814,13 +825,13 @@ describe PostsController do post "/posts.json", params: { raw: 'I can haz a test', title: 'I loves my test', - target_recipients: group.name, + target_recipients: "test_Group", archetype: Archetype.private_message } expect(response.status).to eq(200) - parsed = ::JSON.parse(response.body) + parsed = response.parsed_body post = Post.find(parsed['id']) expect(post.topic.topic_allowed_users.length).to eq(1) @@ -835,7 +846,7 @@ describe PostsController do } expect(response.status).to eq(200) - parsed = ::JSON.parse(response.body) + parsed = response.parsed_body expect(parsed['post']).to be_present expect(parsed['post']['cooked']).to be_present end @@ -884,7 +895,7 @@ describe PostsController do } expect(response.status).to eq(422) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['errors']).to be_present end @@ -954,13 +965,13 @@ describe PostsController do it 'creates a private post' do user_2 = Fabricate(:user) - user_3 = Fabricate(:user) + user_3 = Fabricate(:user, username: "foo_bar") post "/posts.json", params: { raw: 'this is the test content', archetype: 'private_message', title: "this is some post", - target_recipients: "#{user_2.username},#{user_3.username}" + target_recipients: "#{user_2.username},Foo_Bar" } expect(response.status).to eq(200) @@ -983,7 +994,7 @@ describe PostsController do } expect(response.status).to eq(422) - expect(JSON.parse(response.body)["errors"]).to include( + expect(response.parsed_body["errors"]).to include( I18n.t("activerecord.errors.models.topic.attributes.base.no_user_selected") ) end @@ -1004,7 +1015,7 @@ describe PostsController do } expect(response.status).to eq(422) - expect(JSON.parse(response.body)["errors"]).to include( + expect(response.parsed_body["errors"]).to include( I18n.t("create_pm_on_existing_topic") ) end @@ -1027,7 +1038,7 @@ describe PostsController do meta_data: { xyz: 'abc' } } - expect(JSON.parse(response.body)["errors"]).to include(I18n.t(:spamming_host)) + expect(response.parsed_body["errors"]).to include(I18n.t(:spamming_host)) end context "allow_uncategorized_topics is false" do @@ -1102,7 +1113,7 @@ describe PostsController do shared_draft: 'true' } expect(response.status).to eq(200) - result = JSON.parse(response.body) + result = response.parsed_body topic = Topic.find(result['topic_id']) expect(topic.category_id).to eq(shared_category.id) expect(topic.shared_draft.category_id).to eq(destination_category.id) @@ -1394,13 +1405,13 @@ describe PostsController do it "fails when revision is blank" do put "/posts/#{post_id}/revisions/#{blank_post_revision.number}/revert.json" expect(response.status).to eq(422) - expect(JSON.parse(response.body)['errors']).to include(I18n.t('revert_version_same')) + expect(response.parsed_body['errors']).to include(I18n.t('revert_version_same')) end it "fails when revised version is same as current version" do put "/posts/#{post_id}/revisions/#{same_post_revision.number}/revert.json" expect(response.status).to eq(422) - expect(JSON.parse(response.body)['errors']).to include(I18n.t('revert_version_same')) + expect(response.parsed_body['errors']).to include(I18n.t('revert_version_same')) end it "works!" do @@ -1435,7 +1446,7 @@ describe PostsController do TopicEmbed.expects(:expanded_for).with(post).returns("full content") get "/posts/#{post.id}/expand-embed.json" expect(response.status).to eq(200) - expect(::JSON.parse(response.body)['cooked']).to eq("full content") + expect(response.parsed_body['cooked']).to eq("full content") end end @@ -1472,7 +1483,7 @@ describe PostsController do get "/posts/#{user.username}/flagged.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body).length).to eq(2) + expect(response.parsed_body.length).to eq(2) end end end @@ -1507,7 +1518,7 @@ describe PostsController do get "/posts/#{user.username}/deleted.json" expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data.length).to eq(0) end @@ -1521,7 +1532,7 @@ describe PostsController do get "/posts/#{user.username}/deleted.json" expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data.length).to eq(0) end @@ -1537,7 +1548,7 @@ describe PostsController do get "/posts/#{user.username}/deleted.json" expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data.length).to eq(1) expect(data[0]["id"]).to eq(post_deleted_by_admin.id) expect(data[0]["deleted_by"]["id"]).to eq(admin.id) @@ -1650,7 +1661,7 @@ describe PostsController do get "/private-posts.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body post_ids = json['private_posts'].map { |p| p['id'] } expect(post_ids).to include private_post.id @@ -1683,7 +1694,7 @@ describe PostsController do get "/posts.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body post_ids = json['latest_posts'].map { |p| p['id'] } expect(post_ids).to include public_post.id @@ -1699,7 +1710,7 @@ describe PostsController do get "/posts/#{post.id}/cooked.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json).to be_present expect(json['cooked']).to eq('WAt') @@ -1725,7 +1736,7 @@ describe PostsController do get "/posts/#{post.id}/raw-email.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['raw_email']).to eq('email_content') end end diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb index b89af08df5..c14b0d8cd5 100644 --- a/spec/requests/reviewables_controller_spec.rb +++ b/spec/requests/reviewables_controller_spec.rb @@ -48,7 +48,7 @@ describe ReviewablesController do it "returns empty JSON when nothing to review" do get "/review.json" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewables']).to eq([]) end @@ -57,7 +57,7 @@ describe ReviewablesController do get "/review.json" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewables']).to be_present json_review = json['reviewables'][0] @@ -79,14 +79,14 @@ describe ReviewablesController do it "supports filtering by score" do get "/review.json?min_score=1000" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewables']).to be_blank end it "supports offsets" do get "/review.json?offset=100" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewables']).to be_blank end @@ -94,7 +94,7 @@ describe ReviewablesController do Fabricate(:reviewable) get "/review.json?type=ReviewableUser" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewables']).to be_present end @@ -108,23 +108,23 @@ describe ReviewablesController do get "/review.json?type=ReviewableUser&status=pending" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewables']).to be_blank Fabricate(:reviewable, status: Reviewable.statuses[:approved]) get "/review.json?type=ReviewableUser&status=approved" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewables']).to be_present get "/review.json?type=ReviewableUser&status=reviewed" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewables']).to be_present get "/review.json?type=ReviewableUser&status=all" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewables']).to be_present end @@ -138,18 +138,18 @@ describe ReviewablesController do r = Fabricate(:reviewable) get "/review.json?category_id=#{other_category.id}" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewables']).to be_blank get "/review.json?category_id=#{r.category_id}" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewables']).to be_present # By default all categories are returned get "/review.json" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewables']).to be_present end @@ -162,7 +162,7 @@ describe ReviewablesController do get "/review.json" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body json_review = json['reviewables'][0] expect(json_review['id']).to eq(reviewable.id) @@ -173,7 +173,7 @@ describe ReviewablesController do let(:from) { 3.days.ago.strftime('%F') } let(:to) { 1.day.ago.strftime('%F') } - let(:reviewables) { ::JSON.parse(response.body)['reviewables'] } + let(:reviewables) { response.parsed_body['reviewables'] } it 'returns an empty array when no reviewable matches the date range' do reviewable = Fabricate(:reviewable) @@ -200,7 +200,7 @@ describe ReviewablesController do end after do - User.plugin_public_user_custom_fields.clear + DiscoursePluginRegistry.reset! end it "returns user data with custom fields" do @@ -231,7 +231,7 @@ describe ReviewablesController do get "/review/#{reviewable.id}.json" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewable']['id']).to eq(reviewable.id) end @@ -264,7 +264,7 @@ describe ReviewablesController do it "returns the conversation" do get "/review/#{reviewable.id}.json" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body score = json['reviewable_scores'][0] conversation_id = score['reviewable_conversation_id'] @@ -298,7 +298,7 @@ describe ReviewablesController do get "/review/#{reviewable.id}/explain.json" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewable_explanation']['id']).to eq(reviewable.id) expect(json['reviewable_explanation']['total_score']).to eq(reviewable.score) end @@ -337,7 +337,7 @@ describe ReviewablesController do version = qp.version put "/review/#{qp.id}/perform/approve_post.json?version=#{version}" expect(response.code).to eq("422") - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['errors']).to be_present expect(qp.reload.version).to eq(version) end @@ -345,7 +345,7 @@ describe ReviewablesController do it "requires a version parameter" do put "/review/#{reviewable.id}/perform/approve_user.json" expect(response.code).to eq("422") - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['errors']).to be_present end @@ -354,7 +354,7 @@ describe ReviewablesController do put "/review/#{reviewable.id}/perform/approve_user.json?version=#{reviewable.version}" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewable_perform_result']['success']).to eq(true) expect(json['reviewable_perform_result']['version']).to eq(1) expect(json['reviewable_perform_result']['transition_to']).to eq('approved') @@ -394,7 +394,7 @@ describe ReviewablesController do it "fails when the version is wrong" do put "/review/#{reviewable.id}/perform/approve_user.json?version=#{reviewable.version + 1}" expect(response.code).to eq("409") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['errors']).to be_present end end @@ -410,7 +410,7 @@ describe ReviewablesController do it "returns empty json for no reviewables" do get "/review/topics.json" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewable_topics']).to be_blank end @@ -422,7 +422,7 @@ describe ReviewablesController do get "/review/topics.json" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body json_topic = json['reviewable_topics'].find { |rt| rt['id'] == post0.topic_id } expect(json_topic['claimed_by_id']).to eq(moderator.id) @@ -439,7 +439,7 @@ describe ReviewablesController do get "/review/topics.json" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewable_topics']).to be_present json_topic = json['reviewable_topics'].find { |rt| rt['id'] == post0.topic_id } @@ -456,7 +456,7 @@ describe ReviewablesController do it "renders the settings as JSON" do get "/review/settings.json" expect(response.code).to eq("200") - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['reviewable_settings']).to be_present expect(json['reviewable_score_types']).to be_present end @@ -552,7 +552,7 @@ describe ReviewablesController do ) expect(history).to be_present - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['payload']['raw']).to eq('new raw content') expect(json['version'] > 0).to eq(true) end @@ -580,7 +580,7 @@ describe ReviewablesController do expect(reviewable_topic.payload['tags']).to eq(['t2', 't3', 't1']) expect(reviewable_topic.category_id).to eq(new_category_id) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['payload']['raw']).to eq('new topic op') expect(json['payload']['title']).to eq('new topic title') expect(json['payload']['extra']).to be_blank diff --git a/spec/requests/robots_txt_controller_spec.rb b/spec/requests/robots_txt_controller_spec.rb index e58f35172d..16327997c9 100644 --- a/spec/requests/robots_txt_controller_spec.rb +++ b/spec/requests/robots_txt_controller_spec.rb @@ -6,7 +6,7 @@ RSpec.describe RobotsTxtController do describe '#builder' do it "returns json information for building a robots.txt" do get "/robots-builder.json" - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json).to be_present expect(json['header']).to be_present expect(json['agents']).to be_present @@ -17,7 +17,7 @@ RSpec.describe RobotsTxtController do get "/robots-builder.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['header']).to be_present expect(json['agents']).to be_present expect(json['overridden']).to eq("something") @@ -132,6 +132,7 @@ RSpec.describe RobotsTxtController do get '/robots.txt' expect(response.body).to_not include("Disallow: /u/") + expect(response.body).to include("User-agent: googlebot\nAllow") end it "returns overridden robots.txt if the file is overridden" do diff --git a/spec/requests/search_controller_spec.rb b/spec/requests/search_controller_spec.rb index d1d8fff353..dac11690d3 100644 --- a/spec/requests/search_controller_spec.rb +++ b/spec/requests/search_controller_spec.rb @@ -26,11 +26,11 @@ describe SearchController do before do # TODO be a bit more strategic here instead of junking # all of redis - Discourse.redis.flushall + Discourse.redis.flushdb end after do - Discourse.redis.flushall + Discourse.redis.flushdb end context "when overloaded" do @@ -68,7 +68,7 @@ describe SearchController do expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data["posts"]).to be_empty expect(data["grouped_search_result"]["error"]).not_to be_empty @@ -93,7 +93,7 @@ describe SearchController do expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data['posts'].length).to eq(1) expect(data['posts'][0]['id']).to eq(awesome_post.id) @@ -108,7 +108,7 @@ describe SearchController do } expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data['posts'][0]['id']).to eq(user_post.id) expect(data['users']).to be_blank @@ -118,7 +118,7 @@ describe SearchController do } expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data['posts']).to be_blank expect(data['users'][0]['id']).to eq(user.id) @@ -135,7 +135,7 @@ describe SearchController do } expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data['topics'][0]['id']).to eq(awesome_post.topic_id) end @@ -149,7 +149,7 @@ describe SearchController do } expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data['topics'][0]['id']).to eq(user_post.topic_id) end @@ -164,7 +164,7 @@ describe SearchController do expect(response.status).to eq(200) expect(SearchLog.where(term: 'wookie')).to be_present - json = JSON.parse(response.body) + json = response.parsed_body search_log_id = json['grouped_search_result']['search_log_id'] expect(search_log_id).to be_present @@ -257,7 +257,7 @@ describe SearchController do it "sort posts with search priority when search term is empty" do get "/search.json", params: { q: 'status:open' } expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body post1 = data["posts"].find { |e| e["id"] == old_very_hight_priority_post.id } post2 = data["posts"].find { |e| e["id"] == low_priority_post.id } expect(data["posts"][0]["id"]).to eq(old_very_hight_priority_post.id) @@ -267,7 +267,7 @@ describe SearchController do it "sort posts with search priority when no order query" do get "/search.json", params: { q: 'status:open Priority Post' } expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data["posts"][0]["id"]).to eq(old_very_hight_priority_post.id) expect(data["posts"][1]["id"]).to eq(hight_priority_post.id) expect(data["posts"][2]["id"]).to eq(low_priority_post.id) @@ -276,7 +276,7 @@ describe SearchController do it "doesn't sort posts with search piority when query with order" do get "/search.json", params: { q: 'status:open order:latest Priority Post' } expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data["posts"][0]["id"]).to eq(hight_priority_post.id) expect(data["posts"][1]["id"]).to eq(low_priority_post.id) expect(data["posts"][2]["id"]).to eq(old_very_hight_priority_post.id) diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb index 70f88f8e2a..dd44d52970 100644 --- a/spec/requests/session_controller_spec.rb +++ b/spec/requests/session_controller_spec.rb @@ -60,8 +60,8 @@ RSpec.describe SessionController do it 'returns information' do get "/session/email-login/#{email_token.token}.json" - expect(JSON.parse(response.body)["can_login"]).to eq(true) - expect(JSON.parse(response.body)["second_factor_required"]).to eq(nil) + expect(response.parsed_body["can_login"]).to eq(true) + expect(response.parsed_body["second_factor_required"]).to eq(nil) # Does not log in the user expect(session[:current_user_id]).to be_nil @@ -90,7 +90,7 @@ RSpec.describe SessionController do it "includes that information in the response" do get "/session/email-login/#{email_token.token}.json" - response_body_parsed = JSON.parse(response.body) + response_body_parsed = response.parsed_body expect(response_body_parsed["can_login"]).to eq(true) expect(response_body_parsed["second_factor_required"]).to eq(true) expect(response_body_parsed["backup_codes_enabled"]).to eq(true) @@ -103,7 +103,7 @@ RSpec.describe SessionController do it "includes that information in the response" do get "/session/email-login/#{email_token.token}.json" - response_body_parsed = JSON.parse(response.body) + response_body_parsed = response.parsed_body expect(response_body_parsed["can_login"]).to eq(true) expect(response_body_parsed["security_key_required"]).to eq(true) expect(response_body_parsed["second_factor_required"]).to eq(nil) @@ -148,7 +148,7 @@ RSpec.describe SessionController do post "/session/email-login/adasdad.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body)["error"]).to eq( + expect(response.parsed_body["error"]).to eq( I18n.t('email_login.invalid_token') ) end @@ -161,7 +161,7 @@ RSpec.describe SessionController do expect(response.status).to eq(200) - expect(JSON.parse(response.body)["error"]).to eq( + expect(response.parsed_body["error"]).to eq( I18n.t('email_login.invalid_token') ) end @@ -172,7 +172,7 @@ RSpec.describe SessionController do it 'returns success' do post "/session/email-login/#{email_token.token}.json" - expect(JSON.parse(response.body)["success"]).to eq("OK") + expect(response.parsed_body["success"]).to eq("OK") expect(session[:current_user_id]).to eq(user.id) end @@ -201,7 +201,7 @@ RSpec.describe SessionController do expect(response.status).to eq(200) - expect(JSON.parse(response.body)["error"]).to eq(I18n.t("login.not_approved")) + expect(response.parsed_body["error"]).to eq(I18n.t("login.not_approved")) expect(session[:current_user_id]).to eq(nil) end @@ -221,7 +221,7 @@ RSpec.describe SessionController do expect(response.status).to eq(200) - expect(JSON.parse(response.body)["error"]).to eq( + expect(response.parsed_body["error"]).to eq( I18n.t("login.admin_not_allowed_from_ip_address", username: user.username) ) expect(session[:current_user_id]).to eq(nil) @@ -245,7 +245,7 @@ RSpec.describe SessionController do expect(response.status).to eq(200) - expect(JSON.parse(response.body)["error"]).to eq( + expect(response.parsed_body["error"]).to eq( I18n.t("login.not_allowed_from_ip_address", username: user.username) ) expect(session[:current_user_id]).to eq(nil) @@ -270,7 +270,7 @@ RSpec.describe SessionController do expect(response.status).to eq(200) - expect(JSON.parse(response.body)["error"]).to eq( + expect(response.parsed_body["error"]).to eq( I18n.t("login.suspended", date: I18n.l(user.suspended_till, format: :date_only) )) expect(session[:current_user_id]).to eq(nil) @@ -290,7 +290,7 @@ RSpec.describe SessionController do expect(response.status).to eq(200) - expect(JSON.parse(response.body)["error"]).to eq( + expect(response.parsed_body["error"]).to eq( I18n.t("login.invalid_second_factor_code") ) expect(session[:current_user_id]).to eq(nil) @@ -304,7 +304,7 @@ RSpec.describe SessionController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)["error"]).to eq( + expect(response.parsed_body["error"]).to eq( I18n.t("login.invalid_second_factor_code") ) expect(session[:current_user_id]).to eq(nil) @@ -320,7 +320,7 @@ RSpec.describe SessionController do second_factor_method: UserSecondFactor.methods[:totp] } - expect(JSON.parse(response.body)["success"]).to eq("OK") + expect(response.parsed_body["success"]).to eq("OK") expect(session[:current_user_id]).to eq(user.id) end end @@ -331,7 +331,7 @@ RSpec.describe SessionController do second_factor_method: UserSecondFactor.methods[:backup_codes] } - expect(JSON.parse(response.body)["success"]).to eq("OK") + expect(response.parsed_body["success"]).to eq("OK") expect(session[:current_user_id]).to eq(user.id) end end @@ -346,7 +346,7 @@ RSpec.describe SessionController do expect(response.status).to eq(200) - expect(JSON.parse(response.body)["error"]).to eq( + expect(response.parsed_body["error"]).to eq( I18n.t("login.invalid_second_factor_code") ) expect(session[:current_user_id]).to eq(nil) @@ -381,7 +381,7 @@ RSpec.describe SessionController do expect(response.status).to eq(200) expect(session[:current_user_id]).to eq(nil) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body['error']).to eq(I18n.t( 'login.not_enabled_second_factor_method' )) @@ -402,7 +402,7 @@ RSpec.describe SessionController do expect(response.status).to eq(200) expect(session[:current_user_id]).to eq(nil) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body["failed"]).to eq("FAILED") expect(response_body['error']).to eq(I18n.t( 'webauthn.validation.not_found_error' @@ -447,7 +447,7 @@ RSpec.describe SessionController do expect(response.status).to eq(200) expect(session[:current_user_id]).to eq(nil) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body['error']).to eq(I18n.t( 'login.invalid_second_factor_code' )) @@ -461,7 +461,7 @@ RSpec.describe SessionController do expect(response.status).to eq(200) expect(session[:current_user_id]).to eq(nil) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body['error']).to eq(I18n.t( 'login.invalid_second_factor_code' )) @@ -491,7 +491,7 @@ RSpec.describe SessionController do get "/session/#{user.username}/become.json" expect(response.status).to eq(403) - expect(JSON.parse(response.body)["error_type"]).to eq("invalid_access") + expect(response.parsed_body["error_type"]).to eq("invalid_access") expect(session[:current_user_id]).to be_blank end @@ -1055,6 +1055,13 @@ RSpec.describe SessionController do expect(response.body).to eq(I18n.t("sso.missing_secret")) end + it "returns a 422 if no return_sso_url" do + SiteSetting.sso_provider_secrets = "abcdefghij" + sso = SingleSignOnProvider.new + get "/session/sso_provider?sso=asdf&sig=abcdefghij" + expect(response.status).to eq(422) + end + it "successfully redirects user to return_sso_url when the user is logged in" do sign_in(@user) @@ -1226,7 +1233,7 @@ RSpec.describe SessionController do } expect(response.status).to eq(200) - expect(::JSON.parse(response.body)['error']).to eq( + expect(response.parsed_body['error']).to eq( I18n.t("login.incorrect_username_email_or_password") ) end @@ -1240,7 +1247,7 @@ RSpec.describe SessionController do } expect(response.status).to eq(200) - expect(::JSON.parse(response.body)['error']).to eq( + expect(response.parsed_body['error']).to eq( I18n.t("login.incorrect_username_email_or_password") ) end @@ -1258,7 +1265,7 @@ RSpec.describe SessionController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['error']).to eq(I18n.t('login.suspended_with_reason', + expect(response.parsed_body['error']).to eq(I18n.t('login.suspended_with_reason', date: I18n.l(user.suspended_till, format: :date_only), reason: Rack::Utils.escape_html(user.suspend_reason) )) @@ -1275,7 +1282,7 @@ RSpec.describe SessionController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['error']).to eq(I18n.t('login.not_activated')) + expect(response.parsed_body['error']).to eq(I18n.t('login.not_activated')) end end @@ -1342,7 +1349,7 @@ RSpec.describe SessionController do expect(response.status).to eq(200) expect(session[:current_user_id]).to eq(nil) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body["failed"]).to eq("FAILED") expect(response_body['error']).to eq(I18n.t( 'login.invalid_security_key' @@ -1366,7 +1373,7 @@ RSpec.describe SessionController do expect(response.status).to eq(200) expect(session[:current_user_id]).to eq(nil) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body["failed"]).to eq("FAILED") expect(response_body['error']).to eq(I18n.t( 'webauthn.validation.not_found_error' @@ -1407,9 +1414,9 @@ RSpec.describe SessionController do expect(response.status).to eq(200) expect(session[:current_user_id]).to eq(nil) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body["failed"]).to eq("FAILED") - expect(JSON.parse(response.body)['error']).to eq(I18n.t( + expect(response.parsed_body['error']).to eq(I18n.t( 'login.not_enabled_second_factor_method' )) end @@ -1428,7 +1435,7 @@ RSpec.describe SessionController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['error']).to eq(I18n.t( + expect(response.parsed_body['error']).to eq(I18n.t( 'login.invalid_second_factor_method' )) end @@ -1445,7 +1452,7 @@ RSpec.describe SessionController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['error']).to eq(I18n.t( + expect(response.parsed_body['error']).to eq(I18n.t( 'login.invalid_second_factor_code' )) end @@ -1460,7 +1467,7 @@ RSpec.describe SessionController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['error']).to eq(I18n.t( + expect(response.parsed_body['error']).to eq(I18n.t( 'login.invalid_second_factor_code' )) end @@ -1553,7 +1560,7 @@ RSpec.describe SessionController do login: username, password: 'myawesomepassword' } expect(response.status).to eq(200) - expect(::JSON.parse(response.body)['error']).not_to be_present + expect(response.parsed_body['error']).not_to be_present end it "strips spaces from the email" do @@ -1561,7 +1568,7 @@ RSpec.describe SessionController do login: email, password: 'myawesomepassword' } expect(response.status).to eq(200) - expect(::JSON.parse(response.body)['error']).not_to be_present + expect(response.parsed_body['error']).not_to be_present end end @@ -1585,7 +1592,7 @@ RSpec.describe SessionController do it "shows the 'not approved' error message" do expect(response.status).to eq(200) - expect(JSON.parse(response.body)['error']).to eq( + expect(response.parsed_body['error']).to eq( I18n.t('login.not_approved') ) end @@ -1635,7 +1642,7 @@ RSpec.describe SessionController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['error']).to be_present + expect(response.parsed_body['error']).to be_present expect(session[:current_user_id]).not_to eq(user.id) end @@ -1670,7 +1677,7 @@ RSpec.describe SessionController do it "shows the 'not activated' error message" do post_login expect(response.status).to eq(200) - expect(JSON.parse(response.body)['error']).to eq( + expect(response.parsed_body['error']).to eq( I18n.t 'login.not_activated' ) end @@ -1681,7 +1688,7 @@ RSpec.describe SessionController do it "shows the 'not approved' error message" do post_login expect(response.status).to eq(200) - expect(JSON.parse(response.body)['error']).to eq( + expect(response.parsed_body['error']).to eq( I18n.t 'login.not_approved' ) end @@ -1707,7 +1714,7 @@ RSpec.describe SessionController do } expect(response.status).to eq(429) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["error_type"]).to eq("rate_limit") end @@ -1732,7 +1739,7 @@ RSpec.describe SessionController do } expect(response.status).to eq(429) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["error_type"]).to eq("rate_limit") end end @@ -1825,6 +1832,53 @@ RSpec.describe SessionController do expect(response.status).to eq(400) end + it 'should correctly screen ips' do + ScreenedIpAddress.create!( + ip_address: '100.0.0.1', + action_type: ScreenedIpAddress.actions[:block] + ) + + post "/session/forgot_password.json", + params: { login: 'made_up' }, + headers: { 'REMOTE_ADDR' => '100.0.0.1' } + + expect(response.parsed_body).to eq({ + "errors" => [I18n.t("login.reset_not_allowed_from_ip_address")] + }) + + end + + it 'should correctly rate limits' do + RateLimiter.enable + RateLimiter.clear_all! + + user = Fabricate(:user) + + 3.times do + post "/session/forgot_password.json", params: { login: user.username } + expect(response.status).to eq(200) + end + + post "/session/forgot_password.json", params: { login: user.username } + expect(response.status).to eq(422) + + 3.times do + post "/session/forgot_password.json", + params: { login: user.username }, + headers: { 'REMOTE_ADDR' => '10.1.1.1' } + + expect(response.status).to eq(200) + end + + post "/session/forgot_password.json", + params: { login: user.username }, + headers: { 'REMOTE_ADDR' => '100.1.1.1' } + + # not allowed, max 6 a day + expect(response.status).to eq(422) + + end + context 'for a non existant username' do it "doesn't generate a new token for a made up username" do expect do @@ -1936,7 +1990,7 @@ RSpec.describe SessionController do it "returns the JSON for the user" do get "/session/current.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['current_user']).to be_present expect(json['current_user']['id']).to eq(user.id) end diff --git a/spec/requests/similar_topics_controller_spec.rb b/spec/requests/similar_topics_controller_spec.rb index e2ce12bdfc..cef7f5e205 100644 --- a/spec/requests/similar_topics_controller_spec.rb +++ b/spec/requests/similar_topics_controller_spec.rb @@ -33,7 +33,7 @@ describe SimilarTopicsController do get "/topics/similar_to.json", params: { title: title, raw: raw } expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["similar_topics"].size).to eq(0) end @@ -51,7 +51,7 @@ describe SimilarTopicsController do get "/topics/similar_to.json", params: { title: title, raw: raw } expect(response.status).to eq(200) - similar_topics = ::JSON.parse(response.body)["similar_topics"] + similar_topics = response.parsed_body["similar_topics"] expect(similar_topics.size).to eq(1) expect(similar_topics.first["topic_id"]).to eq(topic.id) end @@ -69,7 +69,7 @@ describe SimilarTopicsController do get "/topics/similar_to.json", params: { title: title, raw: raw } expect(response.status).to eq(200) - similar_topics = ::JSON.parse(response.body)["similar_topics"].map { |topic| topic["topic_id"] } + similar_topics = response.parsed_body["similar_topics"].map { |topic| topic["topic_id"] } expect(similar_topics.size).to eq(2) expect(similar_topics).to include(topic.id) expect(similar_topics).to include(private_topic.id) @@ -85,7 +85,7 @@ describe SimilarTopicsController do get "/topics/similar_to.json", params: { title: title, raw: raw } expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json["similar_topics"].size).to eq(0) end end diff --git a/spec/requests/site_controller_spec.rb b/spec/requests/site_controller_spec.rb index 01dd996049..670a0998a3 100644 --- a/spec/requests/site_controller_spec.rb +++ b/spec/requests/site_controller_spec.rb @@ -17,7 +17,7 @@ describe SiteController do Theme.clear_default! get "/site/basic-info.json" - json = JSON.parse(response.body) + json = response.parsed_body expected_url = UrlHelper.absolute(upload.url) @@ -38,7 +38,7 @@ describe SiteController do SiteSetting.share_anonymized_statistics = true get "/site/statistics.json" - json = JSON.parse(response.body) + json = response.parsed_body expect(response.status).to eq(200) expect(json["topic_count"]).to be_present @@ -74,7 +74,7 @@ describe SiteController do SiteSetting.selectable_avatars_enabled = false get "/site/selectable-avatars.json" - json = JSON.parse(response.body) + json = response.parsed_body expect(response.status).to eq(200) expect(json).to eq([]) @@ -84,7 +84,7 @@ describe SiteController do SiteSetting.selectable_avatars_enabled = true get "/site/selectable-avatars.json" - json = JSON.parse(response.body) + json = response.parsed_body expect(response.status).to eq(200) expect(json).to contain_exactly("https://www.discourse.org", "https://meta.discourse.org") diff --git a/spec/requests/static_controller_spec.rb b/spec/requests/static_controller_spec.rb index dff4e02959..8444b20ed4 100644 --- a/spec/requests/static_controller_spec.rb +++ b/spec/requests/static_controller_spec.rb @@ -316,7 +316,7 @@ describe StaticController do it "redirects to the root" do post "/login.json", params: { redirect: ["/foo"] } expect(response.status).to eq(400) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["errors"]).to be_present expect(json["errors"]).to include( I18n.t("invalid_params", message: "redirect") diff --git a/spec/requests/svg_sprite_controller_spec.rb b/spec/requests/svg_sprite_controller_spec.rb index ca61ee3027..60584b8ea8 100644 --- a/spec/requests/svg_sprite_controller_spec.rb +++ b/spec/requests/svg_sprite_controller_spec.rb @@ -76,7 +76,7 @@ describe SvgSpriteController do expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data.length).to eq(200) expect(data[0]["id"]).to eq("ad") end @@ -88,9 +88,46 @@ describe SvgSpriteController do expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data.length).to eq(1) expect(data[0]["id"]).to eq("fab-500px") end end + + context 'svg_icon' do + it "requires .svg extension" do + get "/svg-sprite/#{Discourse.current_hostname}/icon/bolt" + expect(response.status).to eq(404) + end + + it "returns SVG given an icon name" do + get "/svg-sprite/#{Discourse.current_hostname}/icon/bolt.svg" + expect(response.status).to eq(200) + expect(response.body).to include('bolt') + end + + it "returns SVG given an icon name and a color" do + get "/svg-sprite/#{Discourse.current_hostname}/icon/CC0000/fab-github.svg" + expect(response.status).to eq(200) + + expect(response.body).to include('fab-github') + expect(response.body).to include('fill="#CC0000"') + expect(response.headers["Cache-Control"]).to eq("max-age=86400, public, immutable") + end + + it "returns SVG given an icon name and a 3-character HEX color" do + get "/svg-sprite/#{Discourse.current_hostname}/icon/C00/fab-github.svg" + expect(response.status).to eq(200) + + expect(response.body).to include('fab-github') + expect(response.body).to include('fill="#CC0000"') + expect(response.headers["Cache-Control"]).to eq("max-age=86400, public, immutable") + end + + it "ignores non-HEX colors" do + get "/svg-sprite/#{Discourse.current_hostname}/icon/orange/fab-github.svg" + expect(response.status).to eq(404) + end + + end end diff --git a/spec/requests/tag_groups_controller_spec.rb b/spec/requests/tag_groups_controller_spec.rb index 05f4aba2b3..140f295029 100644 --- a/spec/requests/tag_groups_controller_spec.rb +++ b/spec/requests/tag_groups_controller_spec.rb @@ -34,7 +34,7 @@ RSpec.describe TagGroupsController do expect(response.status).to eq(200) - tag_groups = JSON.parse(response.body)["tag_groups"] + tag_groups = response.parsed_body["tag_groups"] expect(tag_groups.count).to eq(1) expect(tag_groups.first["id"]).to eq(tag_group.id) diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb index 8528194691..926e506e35 100644 --- a/spec/requests/tags_controller_spec.rb +++ b/spec/requests/tags_controller_spec.rb @@ -3,17 +3,10 @@ require 'rails_helper' describe TagsController do - define_method(:get_json_body) do - ::JSON.parse(response.body) - end - - let(:json) { get_json_body } - fab!(:user) { Fabricate(:user) } fab!(:admin) { Fabricate(:admin) } fab!(:regular_user) { Fabricate(:trust_level_4) } fab!(:moderator) { Fabricate(:moderator) } - fab!(:category) { Fabricate(:category) } fab!(:subcategory) { Fabricate(:category, parent_category_id: category.id) } @@ -33,9 +26,10 @@ describe TagsController do expect(response.status).to eq(200) - tags = json["tags"] + tags = response.parsed_body["tags"] expect(tags.length).to eq(1) expect(tags[0]['text']).to eq("topic-test") + expect(response.headers['X-Robots-Tag']).to eq('noindex') end end @@ -48,9 +42,9 @@ describe TagsController do get "/tags.json" expect(response.status).to eq(200) - tags = json["tags"] + tags = response.parsed_body["tags"] expect(tags.length).to eq(0) - group = json.dig('extras', 'tag_groups')&.first + group = response.parsed_body.dig('extras', 'tag_groups')&.first expect(group).to be_present expect(group['tags'].length).to eq(2) expect(group['tags'].map { |t| t['id'] }).to contain_exactly(test_tag.name, topic_tag.name) @@ -71,7 +65,7 @@ describe TagsController do expect(response.status).to eq(200) - tags = json["tags"] + tags = response.parsed_body["tags"] expect(tags.length).to eq(2) end @@ -135,7 +129,7 @@ describe TagsController do it "should produce the topic inside the category and not the topic outside of it" do get "/tags/c/#{category.slug}/#{tag.name}.json" - topic_ids = json['topic_list']['topics'].map { |x| x['id'] } + topic_ids = response.parsed_body['topic_list']['topics'].map { |x| x['id'] } expect(topic_ids).to include(topic_in_category.id) expect(topic_ids).to_not include(topic_out_of_category.id) expect(topic_ids).to_not include(topic_in_category_without_tag.id) @@ -168,7 +162,7 @@ describe TagsController do it "should produce the topic inside the subcategory and not the topic outside of it" do get "/tags/c/#{category.slug}/#{subcategory.slug}/#{tag.name}.json" - topic_ids = json['topic_list']['topics'].map { |x| x['id'] } + topic_ids = response.parsed_body['topic_list']['topics'].map { |x| x['id'] } expect(topic_ids).to include(topic_in_subcategory.id) expect(topic_ids).to_not include(topic_out_of_subcategory.id) expect(topic_ids).to_not include(topic_in_subcategory_without_tag.id) @@ -188,26 +182,26 @@ describe TagsController do it "can handle tag with no synonyms" do get "/tag/#{tag.name}/info.json" expect(response.status).to eq(200) - expect(json.dig('tag_info', 'name')).to eq(tag.name) - expect(json.dig('tag_info', 'synonyms')).to be_empty - expect(json.dig('tag_info', 'category_ids')).to be_empty - expect(json.dig('tag_info', 'category_restricted')).to eq(false) + expect(response.parsed_body.dig('tag_info', 'name')).to eq(tag.name) + expect(response.parsed_body.dig('tag_info', 'synonyms')).to be_empty + expect(response.parsed_body.dig('tag_info', 'category_ids')).to be_empty + expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(false) end it "can handle a synonym" do get "/tag/#{synonym.name}/info.json" expect(response.status).to eq(200) - expect(json.dig('tag_info', 'name')).to eq(synonym.name) - expect(json.dig('tag_info', 'synonyms')).to be_empty - expect(json.dig('tag_info', 'category_ids')).to be_empty - expect(json.dig('tag_info', 'category_restricted')).to eq(false) + expect(response.parsed_body.dig('tag_info', 'name')).to eq(synonym.name) + expect(response.parsed_body.dig('tag_info', 'synonyms')).to be_empty + expect(response.parsed_body.dig('tag_info', 'category_ids')).to be_empty + expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(false) end it "can return a tag's synonyms" do synonym get "/tag/#{tag.name}/info.json" expect(response.status).to eq(200) - expect(json.dig('tag_info', 'synonyms').map { |t| t['text'] }).to eq([synonym.name]) + expect(response.parsed_body.dig('tag_info', 'synonyms').map { |t| t['text'] }).to eq([synonym.name]) end it "returns 404 if tag is staff-only" do @@ -230,9 +224,9 @@ describe TagsController do category2.update!(tag_groups: [tag_group]) staff_category = Fabricate(:private_category, group: Fabricate(:group), tags: [tag]) get "/tag/#{tag.name}/info.json" - expect(json.dig('tag_info', 'category_ids')).to contain_exactly(category.id, category2.id) - expect(json['categories']).to be_present - expect(json.dig('tag_info', 'category_restricted')).to eq(true) + expect(response.parsed_body.dig('tag_info', 'category_ids')).to contain_exactly(category.id, category2.id) + expect(response.parsed_body['categories']).to be_present + expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(true) end context 'tag belongs to a tag group' do @@ -241,13 +235,13 @@ describe TagsController do it "returns tag groups if tag groups are visible" do SiteSetting.tags_listed_by_group = true get "/tag/#{tag.name}/info.json" - expect(json.dig('tag_info', 'tag_group_names')).to eq([tag_group.name]) + expect(response.parsed_body.dig('tag_info', 'tag_group_names')).to eq([tag_group.name]) end it "doesn't return tag groups if tag groups aren't visible" do SiteSetting.tags_listed_by_group = false get "/tag/#{tag.name}/info.json" - expect(json['tag_info'].has_key?('tag_group_names')).to eq(false) + expect(response.parsed_body['tag_info'].has_key?('tag_group_names')).to eq(false) end context "restricted to a private category" do @@ -262,24 +256,24 @@ describe TagsController do it "can return categories to users who can access them" do sign_in(admin) get "/tag/#{tag.name}/info.json" - expect(json.dig('tag_info', 'category_ids')).to contain_exactly(private_category.id) - expect(json['categories']).to be_present - expect(json.dig('tag_info', 'category_restricted')).to eq(true) + expect(response.parsed_body.dig('tag_info', 'category_ids')).to contain_exactly(private_category.id) + expect(response.parsed_body['categories']).to be_present + expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(true) end it "can indicate category restriction to users who can't access them" do sign_in(user) get "/tag/#{tag.name}/info.json" - expect(json.dig('tag_info', 'category_ids')).to be_empty - expect(json['categories']).to be_blank - expect(json.dig('tag_info', 'category_restricted')).to eq(true) + expect(response.parsed_body.dig('tag_info', 'category_ids')).to be_empty + expect(response.parsed_body['categories']).to be_blank + expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(true) end it "can indicate category restriction to anon" do get "/tag/#{tag.name}/info.json" - expect(json.dig('tag_info', 'category_ids')).to be_empty - expect(json['categories']).to be_blank - expect(json.dig('tag_info', 'category_restricted')).to eq(true) + expect(response.parsed_body.dig('tag_info', 'category_ids')).to be_empty + expect(response.parsed_body['categories']).to be_blank + expect(response.parsed_body.dig('tag_info', 'category_restricted')).to eq(true) end end end @@ -293,7 +287,7 @@ describe TagsController do expect(response.status).to eq(200) - response_tag = json["valid"].first + response_tag = response.parsed_body["valid"].first expect(response_tag["value"]).to eq(tag.name) end end @@ -359,7 +353,7 @@ describe TagsController do expect(response.status).to eq(200) - tag = json['tags'] + tag = response.parsed_body['tags'] expect(tag[0]["id"]).to eq('test') end end @@ -374,7 +368,7 @@ describe TagsController do expect(response.status).to eq(200) - tag = json['tags'] + tag = response.parsed_body['tags'] expect(tag[0]["id"]).to eq('test') end @@ -383,7 +377,7 @@ describe TagsController do expect(response.status).to eq(200) - tag = json['tags'] + tag = response.parsed_body['tags'] expect(tag[0]["id"]).to eq('test') end end @@ -408,7 +402,7 @@ describe TagsController do context 'tagging enabled' do def parse_topic_ids - get_json_body["topic_list"]["topics"] + response.parsed_body["topic_list"]["topics"] .map { |topic| topic["id"] } end @@ -552,7 +546,7 @@ describe TagsController do tag_names.each { |name| Fabricate(:tag, name: name) } get "/tags/filter/search.json", params: { q: 'stu' } expect(response.status).to eq(200) - expect(json["results"].map { |j| j["id"] }.sort).to eq(['stuff', 'stumped']) + expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq(['stuff', 'stumped']) end it "returns tags ordered by topic_count, and prioritises exact matches" do @@ -562,7 +556,7 @@ describe TagsController do get '/tags/filter/search.json', params: { q: 'tag', limit: 2 } expect(response.status).to eq(200) - expect(json['results'].map { |j| j['id'] }).to eq(['tag', 'tag2']) + expect(response.parsed_body['results'].map { |j| j['id'] }).to eq(['tag', 'tag2']) end context 'with category restriction' do @@ -573,17 +567,17 @@ describe TagsController do nope = Fabricate(:tag, name: 'nope') get "/tags/filter/search.json", params: { q: nope.name, categoryId: category.id } expect(response.status).to eq(200) - expect(json["results"].map { |j| j["id"] }.sort).to eq([]) - expect(json["forbidden"]).to be_present - expect(json["forbidden_message"]).to eq(I18n.t("tags.forbidden.in_this_category", tag_name: nope.name)) + expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq([]) + expect(response.parsed_body["forbidden"]).to be_present + expect(response.parsed_body["forbidden_message"]).to eq(I18n.t("tags.forbidden.in_this_category", tag_name: nope.name)) end it "can say if given tag is restricted to different category" do category get "/tags/filter/search.json", params: { q: yup.name, categoryId: Fabricate(:category).id } - expect(json["results"].map { |j| j["id"] }.sort).to eq([]) - expect(json["forbidden"]).to be_present - expect(json["forbidden_message"]).to eq(I18n.t( + expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq([]) + expect(response.parsed_body["forbidden"]).to be_present + expect(response.parsed_body["forbidden_message"]).to eq(I18n.t( "tags.forbidden.restricted_to", count: 1, tag_name: yup.name, @@ -595,7 +589,7 @@ describe TagsController do nope = Fabricate(:tag, name: 'nope') get "/tags/filter/search.json", params: { categoryId: category.id } expect(response.status).to eq(200) - expect(json["results"].map { |j| j["id"] }.sort).to eq([yup.name]) + expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq([yup.name]) end end @@ -606,21 +600,21 @@ describe TagsController do it "can return synonyms" do get "/tags/filter/search.json", params: { q: 'plant' } expect(response.status).to eq(200) - expect(json['results'].map { |j| j['id'] }).to contain_exactly('plant', 'plants') + expect(response.parsed_body['results'].map { |j| j['id'] }).to contain_exactly('plant', 'plants') end it "can omit synonyms" do get "/tags/filter/search.json", params: { q: 'plant', excludeSynonyms: 'true' } expect(response.status).to eq(200) - expect(json['results'].map { |j| j['id'] }).to contain_exactly('plant') + expect(response.parsed_body['results'].map { |j| j['id'] }).to contain_exactly('plant') end it "can return a message about synonyms not being allowed" do get "/tags/filter/search.json", params: { q: 'plants', excludeSynonyms: 'true' } expect(response.status).to eq(200) - expect(json["results"].map { |j| j["id"] }.sort).to eq([]) - expect(json["forbidden"]).to be_present - expect(json["forbidden_message"]).to eq(I18n.t("tags.forbidden.synonym", tag_name: tag.name)) + expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq([]) + expect(response.parsed_body["forbidden"]).to be_present + expect(response.parsed_body["forbidden_message"]).to eq(I18n.t("tags.forbidden.synonym", tag_name: tag.name)) end end @@ -628,7 +622,7 @@ describe TagsController do yup, nope = Fabricate(:tag, name: 'yup'), Fabricate(:tag, name: 'nope') get "/tags/filter/search.json", params: { q: 'N/ope' } expect(response.status).to eq(200) - expect(json["results"].map { |j| j["id"] }.sort).to eq(["nope"]) + expect(response.parsed_body["results"].map { |j| j["id"] }.sort).to eq(["nope"]) end it "can return tags that are in secured categories but are allowed to be used" do @@ -636,7 +630,7 @@ describe TagsController do Fabricate(:topic, category: c, tags: [Fabricate(:tag, name: "cooltag")]) get "/tags/filter/search.json", params: { q: "cool" } expect(response.status).to eq(200) - expect(json["results"].map { |j| j["id"] }).to eq(['cooltag']) + expect(response.parsed_body["results"].map { |j| j["id"] }).to eq(['cooltag']) end it "supports Chinese and Russian" do @@ -645,13 +639,11 @@ describe TagsController do get "/tags/filter/search.json", params: { q: '房' } expect(response.status).to eq(200) - json = get_json_body - expect(json["results"].map { |j| j["id"] }).to eq(['房地产']) + expect(response.parsed_body["results"].map { |j| j["id"] }).to eq(['房地产']) get "/tags/filter/search.json", params: { q: 'тема' } expect(response.status).to eq(200) - json = get_json_body - expect(json["results"].map { |j| j["id"] }).to eq(['тема-в-разработке']) + expect(response.parsed_body["results"].map { |j| j["id"] }).to eq(['тема-в-разработке']) end it "can return all the results" do @@ -659,10 +651,10 @@ describe TagsController do tag_group2 = Fabricate(:tag_group, tag_names: ['common1', 'common2']) category = Fabricate(:category, tag_groups: [tag_group1]) get "/tags/filter/search.json", params: { q: '', limit: 5, categoryId: category.id, filterForInput: 'true' } + expect(response.status).to eq(200) - json = get_json_body expect_same_tag_names( - json["results"].map { |j| j["id"] }, + response.parsed_body["results"].map { |j| j["id"] }, ['common1', 'common2', 'group1tag', 'group1tag2'] ) end @@ -688,7 +680,7 @@ describe TagsController do it 'returns a tag not found message' do delete "/tag/doesntexists.json" expect(response).not_to be_successful - expect(json['error_type']).to eq('not_found') + expect(response.parsed_body['error_type']).to eq('not_found') end end end @@ -720,7 +712,7 @@ describe TagsController do it 'returns the correct unused tags' do get "/tags/unused.json" expect(response.status).to eq(200) - expect(json["tags"]).to contain_exactly("unused1", "unused2") + expect(response.parsed_body["tags"]).to contain_exactly("unused1", "unused2") end it 'deletes the correct tags' do @@ -817,9 +809,8 @@ describe TagsController do tag3 = Fabricate(:tag) post "/tag/#{tag3.name}/synonyms.json", params: { synonyms: [tag.name] } expect(response.status).to eq(200) - json = JSON.parse(response.body) - expect(json['failed']).to be_present - expect(json.dig('failed_tags', tag.name)).to be_present + expect(response.parsed_body['failed']).to be_present + expect(response.parsed_body.dig('failed_tags', tag.name)).to be_present end end end diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb index ebb2b90f04..9649f57f5b 100644 --- a/spec/requests/topics_controller_spec.rb +++ b/spec/requests/topics_controller_spec.rb @@ -21,7 +21,7 @@ RSpec.describe TopicsController do get "/t/#{topic.id}/wordpress.json", params: { best: 3 } expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body # The JSON has the data the wordpress plugin needs expect(json['id']).to eq(topic.id) @@ -92,7 +92,7 @@ RSpec.describe TopicsController do } expect(response.status).to eq(422) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['errors']).to be_present end @@ -112,7 +112,7 @@ RSpec.describe TopicsController do expect(response.status).to eq(200) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(true) expect(result['url']).to eq(Topic.last.relative_url) @@ -135,7 +135,7 @@ RSpec.describe TopicsController do expect(response.status).to eq(200) - result = JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(true) expect(result['url']).to eq(Topic.last.relative_url) @@ -150,7 +150,7 @@ RSpec.describe TopicsController do post_ids: [p2.id] } expect(response.status).to eq(200) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(false) expect(result['url']).to be_blank end @@ -174,7 +174,7 @@ RSpec.describe TopicsController do p1.reload p2.reload - new_topic_id = JSON.parse(response.body)["url"].split("/").last.to_i + new_topic_id = response.parsed_body["url"].split("/").last.to_i new_topic = Topic.find(new_topic_id) expect(p1.topic.id).to eq(new_topic.id) expect(p2.topic.id).to eq(new_topic.id) @@ -200,7 +200,7 @@ RSpec.describe TopicsController do } expect(response.status).to eq(200) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(true) expect(result['url']).to be_present end @@ -238,7 +238,7 @@ RSpec.describe TopicsController do } expect(response.status).to eq(200) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(false) expect(result['url']).to be_blank end @@ -264,7 +264,7 @@ RSpec.describe TopicsController do } expect(response.status).to eq(403) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['errors']).to be_present end @@ -285,7 +285,7 @@ RSpec.describe TopicsController do expect(response.status).to eq(200) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(true) expect(result['url']).to eq(Topic.last.relative_url) @@ -308,7 +308,7 @@ RSpec.describe TopicsController do expect(response.status).to eq(200) - result = JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(true) expect(result['url']).to eq(Topic.last.relative_url) @@ -324,7 +324,7 @@ RSpec.describe TopicsController do archetype: 'private_message' } expect(response.status).to eq(200) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(false) expect(result['url']).to be_blank end @@ -353,7 +353,7 @@ RSpec.describe TopicsController do } expect(response.status).to eq(200) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(true) expect(result['url']).to be_present end @@ -367,7 +367,7 @@ RSpec.describe TopicsController do } expect(response.status).to eq(200) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(false) expect(result['url']).to be_blank end @@ -409,7 +409,7 @@ RSpec.describe TopicsController do } expect(response.status).to eq(200) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(true) expect(result['url']).to be_present end @@ -453,7 +453,7 @@ RSpec.describe TopicsController do } expect(response.status).to eq(200) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(true) expect(result['url']).to be_present end @@ -697,7 +697,7 @@ RSpec.describe TopicsController do expect(topic.reload.closed).to eq(false) expect(topic.topic_timers).to eq([]) - body = JSON.parse(response.body) + body = response.parsed_body expect(body['topic_status_update']).to eq(nil) end @@ -887,7 +887,7 @@ RSpec.describe TopicsController do it "returns JSON for the slug" do get "/t/id_for/#{topic.slug}.json" expect(response.status).to eq(200) - json = ::JSON.parse(response.body) + json = response.parsed_body expect(json['topic_id']).to eq(topic.id) expect(json['url']).to eq(topic.url) expect(json['slug']).to eq(topic.slug) @@ -953,7 +953,7 @@ RSpec.describe TopicsController do put "/t/#{topic.slug}/#{topic.id}.json" expect(response.status).to eq(200) - expect(::JSON.parse(response.body)['basic_topic']).to be_present + expect(response.parsed_body['basic_topic']).to be_present end it "throws an error if it could not be saved" do @@ -1164,7 +1164,7 @@ RSpec.describe TopicsController do put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: restricted_category.id } - result = ::JSON.parse(response.body) + result = response.parsed_body expect(response.status).to eq(422) expect(result['errors']).to be_present @@ -1177,7 +1177,7 @@ RSpec.describe TopicsController do put "/t/#{topic.slug}/#{topic.id}.json", params: { category_id: restricted_category.id } - result = ::JSON.parse(response.body) + result = response.parsed_body expect(response.status).to eq(422) expect(result['errors']).to be_present @@ -1215,7 +1215,7 @@ RSpec.describe TopicsController do category_id: category.id } - result = ::JSON.parse(response.body) + result = response.parsed_body expect(response.status).to eq(422) expect(result['errors']).to be_present expect(result['errors'][0]).to include(tag2.name) @@ -1229,7 +1229,7 @@ RSpec.describe TopicsController do category_id: category.id } - result = ::JSON.parse(response.body) + result = response.parsed_body expect(response.status).to eq(200) expect(topic.reload.tags).to include(tag1) end @@ -1242,7 +1242,7 @@ RSpec.describe TopicsController do category_id: category.id } - result = ::JSON.parse(response.body) + result = response.parsed_body expect(response.status).to eq(200) expect(topic.reload.tags).to contain_exactly(tag3) end @@ -1255,7 +1255,7 @@ RSpec.describe TopicsController do category_id: category.id } - result = ::JSON.parse(response.body) + result = response.parsed_body expect(response.status).to eq(422) expect(result['errors']).to be_present expect(result['errors'][0]).not_to include(tag3.name) @@ -1269,7 +1269,7 @@ RSpec.describe TopicsController do category_id: restricted_category.id } - result = ::JSON.parse(response.body) + result = response.parsed_body expect(response.status).to eq(200) end end @@ -1763,7 +1763,7 @@ RSpec.describe TopicsController do context 'filters' do def extract_post_stream - json = JSON.parse(response.body) + json = response.parsed_body json["post_stream"]["posts"].map { |post| post["id"] } end @@ -1817,7 +1817,7 @@ RSpec.describe TopicsController do end it 'shows the topic if valid api key is provided' do - get "/t/#{topic.slug}/#{topic.id}.json", params: { api_key: api_key.key } + get "/t/#{topic.slug}/#{topic.id}.json", headers: { "HTTP_API_KEY" => api_key.key } expect(response.status).to eq(200) topic.reload @@ -1826,7 +1826,7 @@ RSpec.describe TopicsController do it 'returns 403 for an invalid key' do [:json, :html].each do |format| - get "/t/#{topic.slug}/#{topic.id}.#{format}", params: { api_key: "bad" } + get "/t/#{topic.slug}/#{topic.id}.#{format}", headers: { "HTTP_API_KEY" => "bad" } expect(response.code.to_i).to eq(403) expect(response.body).to include(I18n.t("invalid_access")) @@ -1843,12 +1843,19 @@ RSpec.describe TopicsController do end it "is not included for normal topics" do - topic = Fabricate(:topic, visible: true) get "/t/#{topic.slug}/#{topic.id}.json" expect(response.headers['X-Robots-Tag']).to eq(nil) end + it "is included when allow_index_in_robots_txt is set to false" do + SiteSetting.allow_index_in_robots_txt = false + + get "/t/#{topic.slug}/#{topic.id}.json" + + expect(response.headers['X-Robots-Tag']).to eq('noindex, nofollow') + end + it "doesn't store an incoming link when there's no referer" do expect { get "/t/#{topic.id}.json" @@ -2070,7 +2077,7 @@ RSpec.describe TopicsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["post_ids"]).to eq([post2.id, post3.id]) end @@ -2089,7 +2096,7 @@ RSpec.describe TopicsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["post_ids"]).to eq([post2.id]) end @@ -2107,7 +2114,7 @@ RSpec.describe TopicsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["post_ids"]).to eq([post2.id]) end @@ -2120,7 +2127,7 @@ RSpec.describe TopicsController do let(:topic) { post.topic } after do - Discourse.redis.flushall + Discourse.redis.flushdb end it 'returns first post of the topic' do @@ -2131,14 +2138,14 @@ RSpec.describe TopicsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["post_stream"]["posts"].first["id"]).to eq(post.id) expect(body["suggested_topics"]).to eq(nil) get "/t/#{topic.id}/posts.json?include_suggested=true" - body = JSON.parse(response.body) + body = response.parsed_body expect(body["suggested_topics"]).not_to eq(nil) end @@ -2159,7 +2166,7 @@ RSpec.describe TopicsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["post_stream"]["posts"].first["id"]).to eq(post2.id) end @@ -2180,7 +2187,7 @@ RSpec.describe TopicsController do expect(response.status).to eq(200) - body = JSON.parse(response.body) + body = response.parsed_body expect(body["post_stream"]["posts"].first["id"]).to eq(post2.id) end @@ -2484,7 +2491,7 @@ RSpec.describe TopicsController do get "/topics/feature_stats.json", params: { category_id: 1 } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["pinned_in_category_count"]).to eq(0) expect(json["pinned_globally_count"]).to eq(0) expect(json["banner_count"]).to eq(0) @@ -2494,7 +2501,7 @@ RSpec.describe TopicsController do Fabricate(:topic, category_id: 1, archetype: Archetype.banner, visible: false) get "/topics/feature_stats.json", params: { category_id: 1 } - json = JSON.parse(response.body) + json = response.parsed_body expect(json["banner_count"]).to eq(1) end end @@ -2510,7 +2517,7 @@ RSpec.describe TopicsController do post_ids: [first_post.id, second_post.id, random_post.id] } - json = JSON.parse(response.body) + json = response.parsed_body json.sort! { |a, b| a["post_id"] <=> b["post_id"] } # no random post @@ -2550,7 +2557,7 @@ RSpec.describe TopicsController do expect(topic.archetype).to eq(Archetype.private_message) expect(response.status).to eq(200) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(true) expect(result['url']).to be_present end @@ -2579,7 +2586,7 @@ RSpec.describe TopicsController do expect(topic.category_id).to eq(category.id) expect(response.status).to eq(200) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result['success']).to eq(true) expect(result['url']).to be_present end @@ -2630,7 +2637,7 @@ RSpec.describe TopicsController do } expect(response.status).to eq(403) - expect(JSON.parse(response.body)["error_type"]).to eq('invalid_access') + expect(response.parsed_body["error_type"]).to eq('invalid_access') end end @@ -2653,7 +2660,7 @@ RSpec.describe TopicsController do expect(topic_status_update.topic).to eq(topic) expect(topic_status_update.execute_at).to eq_time(24.hours.from_now) - json = JSON.parse(response.body) + json = response.parsed_body expect(DateTime.parse(json['execute_at'])) .to eq_time(DateTime.parse(topic_status_update.execute_at.to_s)) @@ -2673,7 +2680,7 @@ RSpec.describe TopicsController do expect(response.status).to eq(200) expect(topic.reload.public_topic_timer).to eq(nil) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['execute_at']).to eq(nil) expect(json['duration']).to eq(nil) @@ -2694,7 +2701,7 @@ RSpec.describe TopicsController do expect(topic_status_update.execute_at).to eq_time(5.days.from_now) expect(topic_status_update.duration).to eq(5) - json = JSON.parse(response.body) + json = response.parsed_body expect(DateTime.parse(json['execute_at'])) .to eq_time(DateTime.parse(topic_status_update.execute_at.to_s)) @@ -2702,6 +2709,24 @@ RSpec.describe TopicsController do expect(json['duration']).to eq(topic_status_update.duration) end + it 'should be able to delete a topic status update for delete_replies type' do + Fabricate(:topic_timer, topic: topic, status_type: TopicTimer.types[:delete_replies]) + + post "/t/#{topic.id}/timer.json", params: { + time: nil, + status_type: TopicTimer.types[7] + } + + expect(response.status).to eq(200) + expect(topic.reload.public_topic_timer).to eq(nil) + + json = response.parsed_body + + expect(json['execute_at']).to eq(nil) + expect(json['duration']).to eq(nil) + expect(json['closed']).to eq(topic.closed) + end + describe 'publishing topic to category in the future' do it 'should be able to create the topic status update' do post "/t/#{topic.id}/timer.json", params: { @@ -2719,7 +2744,7 @@ RSpec.describe TopicsController do expect(topic_status_update.status_type) .to eq(TopicTimer.types[:publish_to_category]) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['category_id']).to eq(topic.category_id) end @@ -2812,7 +2837,7 @@ RSpec.describe TopicsController do expect(response.status).to eq(422) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body["errors"]).to eq([ I18n.t("topic_invite.failed_to_invite", @@ -2853,7 +2878,7 @@ RSpec.describe TopicsController do user: user2.username } expect(response.status).to eq(422) - expect(JSON.parse(response.body)["errors"]).to contain_exactly( + expect(response.parsed_body["errors"]).to contain_exactly( I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients) ) end @@ -2975,7 +3000,7 @@ RSpec.describe TopicsController do group: group.name } expect(response.status).to eq(422) - expect(JSON.parse(response.body)["errors"]).to contain_exactly( + expect(response.parsed_body["errors"]).to contain_exactly( I18n.t("pm_reached_recipients_limit", recipients_limit: SiteSetting.max_allowed_message_recipients) ) end @@ -3060,7 +3085,7 @@ RSpec.describe TopicsController do it "will publish the topic" do put "/t/#{topic.id}/publish.json", params: { destination_category_id: category.id } expect(response.status).to eq(200) - json = ::JSON.parse(response.body)['basic_topic'] + json = response.parsed_body['basic_topic'] result = Topic.find(json['id']) expect(result.category_id).to eq(category.id) diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb index 13298866c0..0be31c1811 100644 --- a/spec/requests/uploads_controller_spec.rb +++ b/spec/requests/uploads_controller_spec.rb @@ -16,9 +16,11 @@ describe UploadsController do sign_in(user) end + let(:logo_file) { file_from_fixtures("logo.png") } let(:logo) do - Rack::Test::UploadedFile.new(file_from_fixtures("logo.png")) + Rack::Test::UploadedFile.new(logo_file) end + let(:logo_filename) { File.basename(logo_file) } let(:fake_jpg) do Rack::Test::UploadedFile.new(file_from_fixtures("fake.jpg")) @@ -36,7 +38,7 @@ describe UploadsController do it 'is successful with an image' do post "/uploads.json", params: { file: logo, type: "avatar" } expect(response.status).to eq 200 - expect(JSON.parse(response.body)["id"]).to be_present + expect(response.parsed_body["id"]).to be_present expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(1) end @@ -47,7 +49,7 @@ describe UploadsController do expect(response.status).to eq 200 expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0) - id = JSON.parse(response.body)["id"] + id = response.parsed_body["id"] expect(id).to be end @@ -65,7 +67,7 @@ describe UploadsController do HTTP_API_USERNAME: user.username.downcase } - json = ::JSON.parse(response.body) + json = response.parsed_body expect(response.status).to eq(200) expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(1) @@ -82,7 +84,7 @@ describe UploadsController do type: "profile_background", } - id = JSON.parse(response.body)["id"] + id = response.parsed_body["id"] expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0) expect(Upload.find(id).retain_hours).to eq(100) end @@ -91,7 +93,7 @@ describe UploadsController do post "/uploads.json", params: { type: "composer" } expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0) - message = JSON.parse(response.body) + message = response.parsed_body expect(response.status).to eq 422 expect(message["errors"]).to contain_exactly(I18n.t("upload.file_missing")) end @@ -104,7 +106,7 @@ describe UploadsController do expect(response.status).to eq(422) expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0) - errors = JSON.parse(response.body)["errors"] + errors = response.parsed_body["errors"] expect(errors.first).to eq(I18n.t("upload.attachments.too_large", max_size_kb: 1)) end @@ -140,7 +142,7 @@ describe UploadsController do } expect(response.status).to eq(200) - id = JSON.parse(response.body)["id"] + id = response.parsed_body["id"] expect(Upload.last.id).to eq(id) end @@ -155,12 +157,12 @@ describe UploadsController do } expect(response.status).to eq(200) - id = JSON.parse(response.body)["id"] + id = response.parsed_body["id"] upload = Upload.last expect(upload.id).to eq(id) - expect(upload.original_filename).to eq('logo.png') + expect(upload.original_filename).to eq(logo_filename) end it 'respects `authorized_extensions_for_staff` setting when staff upload file' do @@ -174,7 +176,7 @@ describe UploadsController do } expect(response.status).to eq(200) - data = JSON.parse(response.body) + data = response.parsed_body expect(data["id"]).to be_present end @@ -187,7 +189,7 @@ describe UploadsController do type: "composer", } - data = JSON.parse(response.body) + data = response.parsed_body expect(data["errors"].first).to eq(I18n.t("upload.unauthorized", authorized_extensions: '')) end @@ -196,7 +198,7 @@ describe UploadsController do expect(response.status).to eq(422) expect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(0) - message = JSON.parse(response.body)["errors"] + message = response.parsed_body["errors"] expect(message).to contain_exactly(I18n.t("upload.images.size_not_found")) end end @@ -214,7 +216,7 @@ describe UploadsController do expect(response.status).to eq(200) - url = JSON.parse(response.body)["url"] + url = response.parsed_body["url"] upload = Upload.get_from_url(url) upload end @@ -265,7 +267,7 @@ describe UploadsController do expect(response.status).to eq(200) expect(response.headers["Content-Disposition"]) - .to eq(%Q|attachment; filename="logo.png"; filename*=UTF-8''logo.png|) + .to eq(%Q|attachment; filename="#{upload.original_filename}"; filename*=UTF-8''#{upload.original_filename}|) end it 'returns 200 when js file' do @@ -282,7 +284,7 @@ describe UploadsController do get "/uploads/#{site}/#{upload.sha1}.json" expect(response.status).to eq(200) expect(response.headers["Content-Disposition"]) - .to eq(%Q|attachment; filename="image_no_extension.png"; filename*=UTF-8''image_no_extension.png|) + .to eq(%Q|attachment; filename="#{upload.original_filename}"; filename*=UTF-8''#{upload.original_filename}|) end it "handles file without extension" do @@ -292,7 +294,7 @@ describe UploadsController do get "/uploads/#{site}/#{upload.sha1}.json" expect(response.status).to eq(200) expect(response.headers["Content-Disposition"]) - .to eq(%Q|attachment; filename="not_an_image"; filename*=UTF-8''not_an_image|) + .to eq(%Q|attachment; filename="#{upload.original_filename}"; filename*=UTF-8''#{upload.original_filename}|) end context "prevent anons from downloading files" do @@ -396,6 +398,16 @@ describe UploadsController do expect(response).to redirect_to(Discourse.store.signed_url_for_path(Discourse.store.get_path_for_upload(upload))) end + it "has the correct caching header" do + sign_in(user) + get upload.short_path + + expected_max_age = S3Helper::DOWNLOAD_URL_EXPIRES_AFTER_SECONDS - UploadsController::SECURE_REDIRECT_GRACE_SECONDS + expect(expected_max_age).to be > 0 # Sanity check that the constants haven't been set to broken values + + expect(response.headers["Cache-Control"]).to eq("max-age=#{expected_max_age}, private") + end + it "raises invalid access if the user cannot access the upload access control post" do sign_in(user) post = Fabricate(:post) @@ -465,7 +477,7 @@ describe UploadsController do post "/uploads/lookup-urls.json", params: { short_urls: [upload.short_url] } expect(response.status).to eq(200) - result = JSON.parse(response.body) + result = response.parsed_body expect(result[0]["url"]).to match("secure-media-uploads") end @@ -600,7 +612,7 @@ describe UploadsController do post "/uploads/lookup-urls.json", params: { short_urls: [upload.short_url] } expect(response.status).to eq(200) - result = JSON.parse(response.body) + result = response.parsed_body expect(result[0]["url"]).to eq(upload.url) expect(result[0]["short_path"]).to eq(upload.short_path) end @@ -623,7 +635,7 @@ describe UploadsController do post "/uploads/lookup-urls.json", params: { short_urls: [upload.short_url] } expect(response.status).to eq(200) - result = JSON.parse(response.body) + result = response.parsed_body expect(result[0]["url"]).to match("/secure-media-uploads") expect(result[0]["short_path"]).to eq(upload.short_path) end @@ -635,7 +647,7 @@ describe UploadsController do post "/uploads/lookup-urls.json", params: { short_urls: [upload.short_url] } expect(response.status).to eq(200) - result = JSON.parse(response.body) + result = response.parsed_body expect(result[0]["url"]).to match("/secure-media-uploads") expect(result[0]["short_path"]).to eq(upload.short_path) end @@ -679,7 +691,7 @@ describe UploadsController do expect(response.status).to eq(200) - result = JSON.parse(response.body) + result = response.parsed_body expect(result["original_filename"]).to eq(upload.original_filename) expect(result["width"]).to eq(upload.width) diff --git a/spec/requests/user_actions_controller_spec.rb b/spec/requests/user_actions_controller_spec.rb index 1240a96947..d0d04ad660 100644 --- a/spec/requests/user_actions_controller_spec.rb +++ b/spec/requests/user_actions_controller_spec.rb @@ -26,7 +26,7 @@ describe UserActionsController do get "/user_actions.json", params: { username: post.user.username } expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body actions = parsed["user_actions"] expect(actions.length).to eq(1) action = actions[0] @@ -50,7 +50,7 @@ describe UserActionsController do expect(response.status).to eq(200) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body["user_actions"].count).to eq(1) @@ -68,7 +68,7 @@ describe UserActionsController do } expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["no_results_help"]).to eq(I18n.t("user_activity.no_bookmarks.self")) end @@ -83,7 +83,7 @@ describe UserActionsController do } expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["no_results_help"]).to eq(I18n.t("user_activity.no_bookmarks.others")) end diff --git a/spec/requests/user_api_keys_controller_spec.rb b/spec/requests/user_api_keys_controller_spec.rb index 8148bef88a..11ab1db45d 100644 --- a/spec/requests/user_api_keys_controller_spec.rb +++ b/spec/requests/user_api_keys_controller_spec.rb @@ -238,7 +238,7 @@ describe UserApiKeysController do SiteSetting.min_trust_level_for_user_api_key = 0 post "/user-api-key", params: args expect(response.status).not_to eq(302) - payload = Nokogiri::HTML(response.body).at('code').content + payload = Nokogiri::HTML5(response.body).at('code').content encrypted = Base64.decode64(payload) key = OpenSSL::PKey::RSA.new(private_key) parsed = JSON.parse(key.private_decrypt(encrypted)) @@ -255,7 +255,7 @@ describe UserApiKeysController do SiteSetting.min_trust_level_for_user_api_key = 0 post "/user-api-key.json", params: args expect(response.status).not_to eq(302) - payload = JSON.parse(response.body)["payload"] + payload = response.parsed_body["payload"] encrypted = Base64.decode64(payload) key = OpenSSL::PKey::RSA.new(private_key) parsed = JSON.parse(key.private_decrypt(encrypted)) diff --git a/spec/requests/user_avatars_controller_spec.rb b/spec/requests/user_avatars_controller_spec.rb index 6ed8d88236..9772fe4b2d 100644 --- a/spec/requests/user_avatars_controller_spec.rb +++ b/spec/requests/user_avatars_controller_spec.rb @@ -27,7 +27,7 @@ describe UserAvatarsController do # travis is not good here, no image magick if !ENV["TRAVIS"] let :upload do - File.open("#{Rails.root}/spec/fixtures/images/cropped.png") do |f| + File.open(file_from_fixtures("cropped.png")) do |f| UploadCreator.new( f, "test.png" diff --git a/spec/requests/user_badges_controller_spec.rb b/spec/requests/user_badges_controller_spec.rb index bd0c8ca354..1c19e01de7 100644 --- a/spec/requests/user_badges_controller_spec.rb +++ b/spec/requests/user_badges_controller_spec.rb @@ -15,7 +15,7 @@ describe UserBadgesController do get "/user_badges.json", params: { badge_id: badge.id } expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["topics"]).to eq(nil) expect(parsed["badges"].length).to eq(1) expect(parsed["user_badge_info"]["user_badges"][0]["post_id"]).to eq(nil) @@ -40,7 +40,7 @@ describe UserBadgesController do get "/user-badges/#{user.username}.json" expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["user_badges"].length).to eq(1) end @@ -49,7 +49,7 @@ describe UserBadgesController do get "/user-badges/#{user.username}", xhr: true expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["user_badges"].length).to eq(1) end @@ -57,7 +57,7 @@ describe UserBadgesController do get "/user_badges.json", params: { badge_id: badge.id } expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["user_badge_info"]["user_badges"].length).to eq(1) end @@ -67,7 +67,7 @@ describe UserBadgesController do } expect(response.status).to eq(200) - parsed = JSON.parse(response.body) + parsed = response.parsed_body expect(parsed["user_badges"].first.has_key?('count')).to eq(true) end end diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb index 5d09c1031f..5d3e0bc0de 100644 --- a/spec/requests/users_controller_spec.rb +++ b/spec/requests/users_controller_spec.rb @@ -12,7 +12,7 @@ describe UsersController do get '/u/hp.json' expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body params = { email: 'jane@jane.com', @@ -179,7 +179,7 @@ describe UsersController do get "/u/password-reset/#{token}.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body)["message"]).to eq(I18n.t('password_reset.no_token')) + expect(response.parsed_body["message"]).to eq(I18n.t('password_reset.no_token')) expect(session[:current_user_id]).to be_blank end end @@ -204,7 +204,7 @@ describe UsersController do put "/u/password-reset/evil_trout!.json", params: { password: "awesomeSecretPassword" } expect(response.status).to eq(200) - expect(JSON.parse(response.body)["message"]).to eq(I18n.t('password_reset.no_token')) + expect(response.parsed_body["message"]).to eq(I18n.t('password_reset.no_token')) expect(session[:current_user_id]).to be_blank end end @@ -488,7 +488,7 @@ describe UsersController do put "/u/password-reset/#{token}.json", params: { password: '' } expect(response.status).to eq(200) - expect(JSON.parse(response.body)["errors"]).to be_present + expect(response.parsed_body["errors"]).to be_present expect(session[:current_user_id]).to be_blank end @@ -496,7 +496,7 @@ describe UsersController do put "/u/password-reset/#{token}.json", params: { password: ('x' * (User.max_password_length + 1)) } expect(response.status).to eq(200) - expect(JSON.parse(response.body)["errors"]).to be_present + expect(response.parsed_body["errors"]).to be_present expect(session[:current_user_id]).to be_blank end @@ -504,7 +504,7 @@ describe UsersController do put "/u/password-reset/#{token}.json", params: { password: 'ksjafh928r' } expect(response.status).to eq(200) - expect(JSON.parse(response.body)["errors"]).to be_blank + expect(response.parsed_body["errors"]).to be_blank expect(session[:current_user_id]).to be_present end @@ -512,7 +512,7 @@ describe UsersController do SiteSetting.must_approve_users = true put "/u/password-reset/#{token}.json", params: { password: 'ksjafh928r' } - expect(JSON.parse(response.body)["errors"]).to be_blank + expect(response.parsed_body["errors"]).to be_blank expect(session[:current_user_id]).to be_blank end end @@ -585,7 +585,7 @@ describe UsersController do describe '#create' do def honeypot_magic(params) get '/u/hp.json' - json = JSON.parse(response.body) + json = response.parsed_body params[:password_confirmation] = json["value"] params[:challenge] = json["challenge"].reverse params @@ -635,13 +635,13 @@ describe UsersController do post_user(invite_code: "abcd") expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["success"]).to eq(false) # case insensitive and stripped of leading/ending spaces post_user(invite_code: " AbC deF ") expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["success"]).to eq(true) end @@ -694,7 +694,7 @@ describe UsersController do post_user expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['success']).to eq(false) expect(json['message']).to be_present end @@ -702,7 +702,7 @@ describe UsersController do it 'creates a user correctly' do post_user expect(response.status).to eq(200) - expect(JSON.parse(response.body)['active']).to be_falsey + expect(response.parsed_body['active']).to be_falsey # should save user_created_message in session expect(session["user_created_message"]).to be_present @@ -722,7 +722,7 @@ describe UsersController do post_user expect(response.status).to eq(200) - expect(JSON.parse(response.body)['active']).to be_falsey + expect(response.parsed_body['active']).to be_falsey # should save user_created_message in session expect(session["user_created_message"]).to be_present @@ -745,7 +745,7 @@ describe UsersController do post_user expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['success']).to eq(false) expect(json['message']).to be_present end @@ -759,7 +759,7 @@ describe UsersController do expect(response.status).to eq(200) expect(session["user_created_message"]).to be_present - json = JSON.parse(response.body) + json = response.parsed_body expect(json['active']).to be_falsey expect(json['message']).to eq(I18n.t("login.activate_email", email: post_user_params[:email])) end @@ -770,7 +770,7 @@ describe UsersController do it "won't create the user as active" do post "/u.json", params: post_user_params.merge(active: true) expect(response.status).to eq(200) - expect(JSON.parse(response.body)['active']).to be_falsey + expect(response.parsed_body['active']).to be_falsey end context "with a regular api key" do @@ -782,7 +782,7 @@ describe UsersController do params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['active']).to be_falsey + expect(response.parsed_body['active']).to be_falsey end end @@ -801,7 +801,7 @@ describe UsersController do expect(Jobs::SendSystemMessage.jobs.size).to eq(0) expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body new_user = User.find(json["user_id"]) email_token = new_user.email_tokens.active.where(email: new_user.email).first @@ -822,7 +822,7 @@ describe UsersController do post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body new_user = User.find(json["user_id"]) expect(json['active']).to be_truthy @@ -837,7 +837,7 @@ describe UsersController do post "/u.json", params: post_user_params, headers: { HTTP_API_KEY: api_key.key } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body new_user = User.find(json["user_id"]) expect(json['active']).to eq(false) @@ -850,7 +850,7 @@ describe UsersController do post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['active']).to be_falsy + expect(response.parsed_body['active']).to be_falsy end it "won't set the new user's locale to the admin's locale" do @@ -860,7 +860,7 @@ describe UsersController do post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body new_user = User.find(json["user_id"]) expect(new_user.locale).not_to eq("fr") end @@ -873,7 +873,7 @@ describe UsersController do post "/u.json", params: post_user_params.merge(active: true), headers: { HTTP_API_KEY: api_key.key } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body new_user = User.find(json["user_id"]) expect(json['active']).to be_truthy @@ -945,7 +945,7 @@ describe UsersController do User.any_instance.expects(:enqueue_welcome_message) post_user expect(response.status).to eq(200) - expect(JSON.parse(response.body)['message']).to eq( + expect(response.parsed_body['message']).to eq( I18n.t 'login.active' ) end @@ -961,7 +961,7 @@ describe UsersController do User.any_instance.expects(:enqueue_welcome_message) post_user expect(response.status).to eq(200) - expect(JSON.parse(response.body)['active']).to be_truthy + expect(response.parsed_body['active']).to be_truthy end it 'doesn\'t succeed when new registrations are disabled' do @@ -970,7 +970,7 @@ describe UsersController do post_user expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['success']).to eq(false) expect(json['message']).to be_present end @@ -1019,7 +1019,7 @@ describe UsersController do } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['success']).to eq(false) expect(json['message']).to be_present end @@ -1033,7 +1033,7 @@ describe UsersController do } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['success']).to eq(true) end end @@ -1042,7 +1042,7 @@ describe UsersController do it "creates user successfully but doesn't activate the account" do post_user expect(response.status).to eq(200) - json = JSON::parse(response.body) + json = response.parsed_body expect(json["success"]).to eq(true) expect(User.find_by(username: @user.username).active).to eq(false) end @@ -1057,7 +1057,7 @@ describe UsersController do expect(response.status).to eq(200) - json = JSON::parse(response.body) + json = response.parsed_body expect(json["success"]).to eq(true) # should not change the session @@ -1103,7 +1103,7 @@ describe UsersController do it 'should report failed' do post "/u.json", params: create_params - json = JSON::parse(response.body) + json = response.parsed_body expect(json["success"]).not_to eq(true) # should not change the session @@ -1253,7 +1253,7 @@ describe UsersController do ) expect(response.status).to eq(200) - result = ::JSON.parse(response.body) + result = response.parsed_body expect(result["success"]).to eq(true) created_user = User.find_by_email(staged.email) @@ -1309,7 +1309,7 @@ describe UsersController do expect(response.status).to eq(422) - body = JSON.parse(response.body) + body = response.parsed_body expect(body['errors'].first).to include(I18n.t( 'user.username.short', min: User.username_length.begin @@ -1328,7 +1328,7 @@ describe UsersController do it 'raises an error when the username clashes with an existing user route' do put "/u/#{user.username}/preferences/username.json", params: { new_username: 'account-created' } - body = JSON.parse(response.body) + body = response.parsed_body expect(body['errors'].first).to include(I18n.t('login.reserved_username')) end @@ -1337,7 +1337,7 @@ describe UsersController do SiteSetting.reserved_usernames = 'reserved' put "/u/#{user.username}/preferences/username.json", params: { new_username: 'reserved' } - body = JSON.parse(response.body) + body = response.parsed_body expect(body['errors'].first).to include(I18n.t('login.reserved_username')) end @@ -1370,7 +1370,7 @@ describe UsersController do it 'should return a JSON response with the updated username' do put "/u/#{user.username}/preferences/username.json", params: { new_username: new_username } - expect(::JSON.parse(response.body)['username']).to eq(new_username) + expect(response.parsed_body['username']).to eq(new_username) end it 'should respond with proper error message if sso_overrides_username is enabled' do @@ -1383,7 +1383,7 @@ describe UsersController do put "/u/#{user.username}/preferences/username.json", params: { new_username: new_username } expect(response.status).to eq(422) - expect(::JSON.parse(response.body)['errors'].first).to include(I18n.t('errors.messages.sso_overrides_username')) + expect(response.parsed_body['errors'].first).to include(I18n.t('errors.messages.sso_overrides_username')) end end end @@ -1397,15 +1397,15 @@ describe UsersController do shared_examples 'when username is unavailable' do it 'should return available as false in the JSON and return a suggested username' do expect(response.status).to eq(200) - expect(::JSON.parse(response.body)['available']).to eq(false) - expect(::JSON.parse(response.body)['suggestion']).to be_present + expect(response.parsed_body['available']).to eq(false) + expect(response.parsed_body['suggestion']).to be_present end end shared_examples 'when username is available' do it 'should return available in the JSON' do expect(response.status).to eq(200) - expect(::JSON.parse(response.body)['available']).to eq(true) + expect(response.parsed_body['available']).to eq(true) end end @@ -1432,8 +1432,8 @@ describe UsersController do shared_examples 'checking an invalid username' do it 'should not return an available key but should return an error message' do expect(response.status).to eq(200) - expect(::JSON.parse(response.body)['available']).to eq(nil) - expect(::JSON.parse(response.body)['errors']).to be_present + expect(response.parsed_body['available']).to eq(nil) + expect(response.parsed_body['errors']).to be_present end end @@ -1445,7 +1445,7 @@ describe UsersController do it 'should return the invalid characters message' do expect(response.status).to eq(200) - expect(::JSON.parse(response.body)['errors']).to include(I18n.t(:'user.username.characters')) + expect(response.parsed_body['errors']).to include(I18n.t(:'user.username.characters')) end end @@ -1457,7 +1457,7 @@ describe UsersController do it 'should return the "too long" message' do expect(response.status).to eq(200) - expect(::JSON.parse(response.body)['errors']).to include(I18n.t(:'user.username.long', max: User.username_length.end)) + expect(response.parsed_body['errors']).to include(I18n.t(:'user.username.long', max: User.username_length.end)) end end @@ -1509,7 +1509,7 @@ describe UsersController do get "/u/#{user.username}/invited_count.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json).to be_present expect(json['counts']).to be_present end @@ -1542,14 +1542,14 @@ describe UsersController do get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' } expect(response.status).to eq(200) - invites = JSON.parse(response.body)['invites'] + invites = response.parsed_body['invites'] expect(invites.size).to eq(1) expect(invites.first).to include('email' => 'billybob@example.com') get "/u/#{inviter.username}/invited.json", params: { search: invitee.username } expect(response.status).to eq(200) - invites = JSON.parse(response.body)['invites'] + invites = response.parsed_body['invites'] expect(invites.size).to eq(2) expect(invites[0]['email']).to be_present end @@ -1565,13 +1565,13 @@ describe UsersController do get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' } expect(response.status).to eq(200) - invites = JSON.parse(response.body)['invites'] + invites = response.parsed_body['invites'] expect(invites.size).to eq(0) get "/u/#{inviter.username}/invited.json", params: { search: invitee.username } expect(response.status).to eq(200) - invites = JSON.parse(response.body)['invites'] + invites = response.parsed_body['invites'] expect(invites.size).to eq(2) expect(invites[0]['email']).to be_blank end @@ -1587,7 +1587,7 @@ describe UsersController do get "/u/#{inviter.username}/invited.json", params: { search: 'billybob' } expect(response.status).to eq(200) - invites = JSON.parse(response.body)['invites'] + invites = response.parsed_body['invites'] expect(invites.size).to eq(1) expect(invites[0]['email']).to be_present end @@ -1613,7 +1613,7 @@ describe UsersController do get "/u/#{inviter.username}/invited.json" expect(response.status).to eq(200) - invites = JSON.parse(response.body)['invites'] + invites = response.parsed_body['invites'] expect(invites.size).to eq(1) expect(invites.first).to include('email' => invite.email) end @@ -1631,7 +1631,7 @@ describe UsersController do get "/u/#{inviter.username}/invited/pending.json" expect(response.status).to eq(200) - invites = JSON.parse(response.body)['invites'] + invites = response.parsed_body['invites'] expect(invites.size).to eq(1) expect(invites.first).to include("email" => invite.email) end @@ -1664,7 +1664,7 @@ describe UsersController do get "/u/#{inviter.username}/invited.json" expect(response.status).to eq(200) - invites = JSON.parse(response.body)['invites'] + invites = response.parsed_body['invites'] expect(invites.size).to eq(1) expect(invites.first).to include('email' => invite.email) end @@ -1779,6 +1779,7 @@ describe UsersController do end it "updates the title" do + BadgeGranter.enable_queue user.update!(locale: :fr) user.change_trust_level!(TrustLevel[4]) BadgeGranter.process_queue! @@ -1786,6 +1787,9 @@ describe UsersController do leader_title = I18n.t("badges.leader.name", locale: :fr) put "/u/#{user.username}.json", params: { title: leader_title } expect(user.reload.title).to eq(leader_title) + ensure + BadgeGranter.disable_queue + BadgeGranter.clear_queue! end end @@ -1851,8 +1855,7 @@ describe UsersController do end after do - User.plugin_editable_user_custom_fields.clear - User.plugin_staff_editable_user_custom_fields.clear + DiscoursePluginRegistry.reset! end it "only updates allowed user fields" do @@ -1903,8 +1906,7 @@ describe UsersController do end it "is secure when there are no registered editable fields" do - User.plugin_editable_user_custom_fields.clear - User.plugin_staff_editable_user_custom_fields.clear + DiscoursePluginRegistry.reset! put "/u/#{user.username}.json", params: { custom_fields: { test1: :hello1, test2: :hello2, test3: :hello3 } } expect(response.status).to eq(200) expect(user.custom_fields["test1"]).to be_blank @@ -1931,7 +1933,7 @@ describe UsersController do it 'returns user JSON' do put "/u/#{user.username}.json" - json = JSON.parse(response.body) + json = response.parsed_body expect(json['user']['id']).to eq user.id end end @@ -2035,7 +2037,7 @@ describe UsersController do post "/u/action/send_activation_email.json", params: { username: user.username } expect(response.status).to eq(409) - expect(JSON.parse(response.body)['errors']).to include(I18n.t( + expect(response.parsed_body['errors']).to include(I18n.t( 'activation.activated' )) expect(session[SessionController::ACTIVATE_USER_KEY]).to eq(nil) @@ -2433,6 +2435,7 @@ describe UsersController do it "redirects if the user is not logged in" do get "/my/wat.json" expect(response).to be_redirect + expect(response.headers['X-Robots-Tag']).to eq('noindex') end context "when the user is logged in" do @@ -2477,7 +2480,7 @@ describe UsersController do get "/u/#{user.username}/emails.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["email"]).to eq(user.email) expect(json["secondary_emails"]).to eq(user.secondary_emails) expect(json["associated_accounts"]).to eq([]) @@ -2490,7 +2493,7 @@ describe UsersController do get "/u/#{user.username}/emails.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["email"]).to eq(user.email) expect(json["secondary_emails"]).to eq(user.secondary_emails) expect(json["associated_accounts"]).to eq([]) @@ -2503,7 +2506,7 @@ describe UsersController do get "/u/#{inactive_user.username}/emails.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["email"]).to eq(inactive_user.email) expect(json["secondary_emails"]).to eq(inactive_user.secondary_emails) expect(json["associated_accounts"]).to eq([]) @@ -2525,7 +2528,7 @@ describe UsersController do get "/u/is_local_username.json", params: { username: user.username } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["valid"][0]).to eq(user.username) end @@ -2533,7 +2536,7 @@ describe UsersController do sign_in(user) get "/u/is_local_username.json", params: { username: group.name } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["valid_groups"]).to include(group.name) expect(json["mentionable_groups"].find { |g| g['name'] == group.name }).to be_present end @@ -2542,7 +2545,7 @@ describe UsersController do sign_in(user) get "/u/is_local_username.json", params: { username: unmentionable.name } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["valid_groups"]).to include(unmentionable.name) expect(json["mentionable_groups"]).to be_blank end @@ -2551,7 +2554,7 @@ describe UsersController do get "/u/is_local_username.json", params: { usernames: [user.username, "system"] } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["valid"].size).to eq(2) end @@ -2561,7 +2564,7 @@ describe UsersController do get "/u/is_local_username.json", params: { usernames: [staged.username] } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["valid"].size).to eq(0) end @@ -2573,7 +2576,7 @@ describe UsersController do } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["cannot_see"].size).to eq(1) end @@ -2585,7 +2588,7 @@ describe UsersController do } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["cannot_see"].size).to eq(0) end @@ -2597,7 +2600,7 @@ describe UsersController do } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["cannot_see"].size).to eq(1) end @@ -2609,7 +2612,7 @@ describe UsersController do } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["cannot_see"].size).to eq(0) end end @@ -2632,7 +2635,7 @@ describe UsersController do get "/u/#{user.username}/topic-tracking-state.json" expect(response.status).to eq(200) - states = JSON.parse(response.body) + states = response.parsed_body expect(states[0]["topic_id"]).to eq(topic.id) end end @@ -2645,7 +2648,7 @@ describe UsersController do get "/u/#{user.username_lower}/summary.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["user_summary"]["topic_count"]).to eq(1) expect(json["user_summary"]["post_count"]).to eq(0) @@ -2903,7 +2906,7 @@ describe UsersController do it "returns success" do get "/u/#{user.username}.json" expect(response.status).to eq(200) - parsed = JSON.parse(response.body)["user"] + parsed = response.parsed_body["user"] expect(parsed['username']).to eq(user.username) expect(parsed["profile_hidden"]).to be_blank @@ -2915,7 +2918,7 @@ describe UsersController do get "/u/#{user.username}.json" expect(response.status).to eq(200) - parsed = JSON.parse(response.body)["user"] + parsed = response.parsed_body["user"] expect(parsed["username"]).to eq(user.username) expect(parsed["profile_hidden"]).to eq(true) @@ -2956,7 +2959,7 @@ describe UsersController do expect(response.status).to eq(200) expect(response.headers['X-Robots-Tag']).to eq('noindex') - json = JSON.parse(response.body) + json = response.parsed_body expect(json["user"]["has_title_badges"]).to eq(false) end @@ -3010,7 +3013,7 @@ describe UsersController do it "returns fetch for a matching external_id" do get "/u/by-external/997.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body)["user"]["username"]).to eq(user.username) + expect(response.parsed_body["user"]["username"]).to eq(user.username) end it "returns not found when external_id doesn't match" do @@ -3032,7 +3035,7 @@ describe UsersController do it "includes only visible posts" do get "/u/#{admin.username}.json", params: { include_post_count_for: topic.id } - topic_post_count = JSON.parse(response.body).dig("user", "topic_post_count") + topic_post_count = response.parsed_body.dig("user", "topic_post_count") expect(topic_post_count[topic.id.to_s]).to eq(1) end @@ -3040,7 +3043,7 @@ describe UsersController do sign_in(admin) get "/u/#{admin.username}.json", params: { include_post_count_for: topic.id } - topic_post_count = JSON.parse(response.body).dig("user", "topic_post_count") + topic_post_count = response.parsed_body.dig("user", "topic_post_count") expect(topic_post_count[topic.id.to_s]).to eq(2) end end @@ -3074,7 +3077,7 @@ describe UsersController do it "returns success" do get "/u/#{user.username}/card.json" expect(response.status).to eq(200) - parsed = JSON.parse(response.body)["user"] + parsed = response.parsed_body["user"] expect(parsed["username"]).to eq(user.username) expect(parsed["profile_hidden"]).to be_blank @@ -3099,7 +3102,7 @@ describe UsersController do get "/u/#{user.username}/card.json" expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["user"]["associated_accounts"]).to eq(nil) # Not serialized in card expect(json["user"]["username"]).to eq(user.username) @@ -3125,7 +3128,7 @@ describe UsersController do it "returns success" do get "/user-cards.json?user_ids=#{user.id},#{user2.id}" expect(response.status).to eq(200) - parsed = JSON.parse(response.body)["users"] + parsed = response.parsed_body["users"] expect(parsed.map { |u| u["username"] }).to contain_exactly(user.username, user2.username) end @@ -3140,7 +3143,7 @@ describe UsersController do user2.user_option.update(hide_profile_and_presence: true) get "/user-cards.json?user_ids=#{user.id},#{user2.id}" expect(response.status).to eq(200) - parsed = JSON.parse(response.body)["users"] + parsed = response.parsed_body["users"] expect(parsed.map { |u| u["username"] }).to contain_exactly(user.username) end @@ -3221,14 +3224,14 @@ describe UsersController do it "searches when provided the term only" do get "/u/search/users.json", params: { term: user.name.split(" ").last } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["users"].map { |u| u["username"] }).to include(user.username) end it "searches when provided the topic only" do get "/u/search/users.json", params: { topic_id: topic.id } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["users"].map { |u| u["username"] }).to include(user.username) end @@ -3238,7 +3241,7 @@ describe UsersController do } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["users"].map { |u| u["username"] }).to include(user.username) end @@ -3262,7 +3265,7 @@ describe UsersController do } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json["users"].map { |u| u["username"] }).to_not include(user.username) expect(json["users"].map { |u| u["username"] }).to include(privileged_user.username) end @@ -3283,7 +3286,7 @@ describe UsersController do it "returns names" do get "/u/search/users.json", params: { term: user.name } - json = JSON.parse(response.body) + json = response.parsed_body expect(json["users"].map { |u| u["name"] }).to include(user.name) end end @@ -3295,7 +3298,7 @@ describe UsersController do it "returns names" do get "/u/search/users.json", params: { term: user.name } - json = JSON.parse(response.body) + json = response.parsed_body expect(json["users"].map { |u| u["name"] }).not_to include(user.name) end end @@ -3347,7 +3350,7 @@ describe UsersController do expect(response.status).to eq(200) - groups = JSON.parse(response.body)["groups"] + groups = response.parsed_body["groups"] expect(groups).to eq(nil) end @@ -3356,7 +3359,7 @@ describe UsersController do expect(response.status).to eq(200) - groups = JSON.parse(response.body)["groups"] + groups = response.parsed_body["groups"] expect(groups.map { |group| group['name'] }) .to_not include(private_group.name) @@ -3370,7 +3373,7 @@ describe UsersController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)).not_to have_key(:groups) + expect(response.parsed_body).not_to have_key(:groups) end it "searches for messageable groups" do @@ -3382,7 +3385,7 @@ describe UsersController do expect(response.status).to eq(200) - expect(JSON.parse(response.body)["groups"].map { |group| group['name'] }) + expect(response.parsed_body["groups"].map { |group| group['name'] }) .to contain_exactly(messageable_group.name, Group.find(Group::AUTO_GROUPS[:moderators]).name) end @@ -3395,7 +3398,7 @@ describe UsersController do expect(response.status).to eq(200) - groups = JSON.parse(response.body)["groups"] + groups = response.parsed_body["groups"] expect(groups.map { |group| group['name'] }) .to contain_exactly(mentionable_group.name, mentionable_group_2.name) @@ -3411,7 +3414,7 @@ describe UsersController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)).not_to have_key(:groups) + expect(response.parsed_body).not_to have_key(:groups) get "/u/search/users.json", params: { include_mentionable_groups: 'false', @@ -3420,7 +3423,7 @@ describe UsersController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)).not_to have_key(:groups) + expect(response.parsed_body).not_to have_key(:groups) get "/u/search/users.json", params: { include_messageable_groups: 'false', @@ -3429,7 +3432,7 @@ describe UsersController do } expect(response.status).to eq(200) - expect(JSON.parse(response.body)).not_to have_key(:groups) + expect(response.parsed_body).not_to have_key(:groups) end end @@ -3477,7 +3480,7 @@ describe UsersController do end def users_found - JSON.parse(response.body)['users'].map { |u| u['username'] } + response.parsed_body['users'].map { |u| u['username'] } end end end @@ -3505,7 +3508,7 @@ describe UsersController do post "/u/email-login.json", params: { login: user.email } expect(response.status).to eq(200) - expect(JSON.parse(response.body)['user_found']).to eq(true) + expect(response.parsed_body['user_found']).to eq(true) job_args = Jobs::CriticalUserEmail.jobs.last["args"].first @@ -3530,7 +3533,7 @@ describe UsersController do post "/u/email-login.json", params: { login: '@random' } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json['user_found']).to eq(false) expect(json['hide_taken']).to eq(false) expect(Jobs::CriticalUserEmail.jobs).to eq([]) @@ -3543,7 +3546,7 @@ describe UsersController do post "/u/email-login.json", params: { login: user.email } expect(response.status).to eq(200) - json = JSON.parse(response.body) + json = response.parsed_body expect(json.has_key?('user_found')).to eq(false) expect(json['hide_taken']).to eq(true) end @@ -3610,7 +3613,7 @@ describe UsersController do expect(response.status).to eq(200) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body['key']).to be_present expect(response_body['qr']).to be_present @@ -3646,7 +3649,7 @@ describe UsersController do post "/users/enable_second_factor_totp.json", params: { name: "test", second_factor_token: "123456" } end it "shows a helpful error message to the user" do - expect(JSON.parse(response.body)['error']).to eq(I18n.t("login.invalid_second_factor_code")) + expect(response.parsed_body['error']).to eq(I18n.t("login.invalid_second_factor_code")) end end @@ -3656,7 +3659,7 @@ describe UsersController do post "/users/enable_second_factor_totp.json", params: { second_factor_token: "123456" } end it "shows a helpful error message to the user" do - expect(JSON.parse(response.body)['error']).to eq(I18n.t("login.missing_second_factor_name")) + expect(response.parsed_body['error']).to eq(I18n.t("login.missing_second_factor_name")) end end @@ -3666,7 +3669,7 @@ describe UsersController do post "/users/enable_second_factor_totp.json", params: { name: "test" } end it "shows a helpful error message to the user" do - expect(JSON.parse(response.body)['error']).to eq(I18n.t("login.missing_second_factor_code")) + expect(response.parsed_body['error']).to eq(I18n.t("login.missing_second_factor_code")) end end end @@ -3813,7 +3816,7 @@ describe UsersController do expect(response.status).to eq(200) - response_body = JSON.parse(response.body) + response_body = response.parsed_body # we use SecureRandom.hex(16) for backup codes, ensure this continues to be the case expect(response_body['backup_codes'].map(&:length)).to eq([32] * 10) @@ -3826,7 +3829,7 @@ describe UsersController do it "stores the challenge in the session and returns challenge data, user id, and supported algorithms" do create_second_factor_security_key secure_session = read_secure_session - response_parsed = JSON.parse(response.body) + response_parsed = response.parsed_body expect(response_parsed["challenge"]).to eq( Webauthn.challenge(user, secure_session) ) @@ -3849,7 +3852,7 @@ describe UsersController do it "returns those existing active credentials" do create_second_factor_security_key - response_parsed = JSON.parse(response.body) + response_parsed = response.parsed_body expect(response_parsed["existing_active_credential_ids"]).to eq( [user_security_key.credential_id] ) @@ -3862,7 +3865,7 @@ describe UsersController do it "creates a security key for the user" do simulate_localhost_webauthn_challenge create_second_factor_security_key - response_parsed = JSON.parse(response.body) + response_parsed = response.parsed_body post "/u/register_second_factor_security_key.json", params: valid_security_key_create_post_data @@ -3876,7 +3879,7 @@ describe UsersController do it "shows a security key error and does not create a key" do stub_as_dev_localhost create_second_factor_security_key - response_parsed = JSON.parse(response.body) + response_parsed = response.parsed_body post "/u/register_second_factor_security_key.json", params: { id: "bad id", @@ -3888,7 +3891,7 @@ describe UsersController do } expect(user.security_keys.count).to eq(0) - expect(JSON.parse(response.body)["error"]).to eq(I18n.t("webauthn.validation.invalid_type_error")) + expect(response.parsed_body["error"]).to eq(I18n.t("webauthn.validation.invalid_type_error")) end end end @@ -4082,7 +4085,7 @@ describe UsersController do it 'returns password required response' do expect(response.status).to eq(200) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body['password_required']).to eq(true) end end @@ -4100,7 +4103,7 @@ describe UsersController do post "/u/second_factors.json", params: { password: password } expect(response.status).to eq(200) - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body['totps'].map { |second_factor| second_factor['id'] }).to include(totp_second_factor.id) expect(response_body['security_keys'].map { |second_factor| second_factor['id'] }).to include(security_key_second_factor.id) end @@ -4113,7 +4116,7 @@ describe UsersController do post "/u/second_factors.json", params: { password: password } - response_body = JSON.parse(response.body) + response_body = response.parsed_body expect(response_body['error']).to eq( I18n.t("login.incorrect_password") ) @@ -4237,7 +4240,7 @@ describe UsersController do sign_in(user) get "/u/#{user.username}/bookmarks.json" expect(response.status).to eq(200) - expect(JSON.parse(response.body)['user_bookmark_list']['bookmarks'].map { |b| b['id'] }).to match_array([bookmark1.id, bookmark2.id]) + expect(response.parsed_body['user_bookmark_list']['bookmarks'].map { |b| b['id'] }).to match_array([bookmark1.id, bookmark2.id]) end it "does not show another user's bookmarks" do diff --git a/spec/requests/webhooks_controller_spec.rb b/spec/requests/webhooks_controller_spec.rb index 7772e0eb18..580c0c72f0 100644 --- a/spec/requests/webhooks_controller_spec.rb +++ b/spec/requests/webhooks_controller_spec.rb @@ -3,7 +3,7 @@ require "rails_helper" describe WebhooksController do - before { Discourse.redis.flushall } + before { Discourse.redis.flushdb } let(:email) { "em@il.com" } let(:message_id) { "12345@il.com" } diff --git a/spec/requests/wizard_controller_spec.rb b/spec/requests/wizard_controller_spec.rb index d315a09313..0d10b4b3de 100644 --- a/spec/requests/wizard_controller_spec.rb +++ b/spec/requests/wizard_controller_spec.rb @@ -43,7 +43,7 @@ describe WizardController do sign_in(Fabricate(:admin)) get "/wizard.json" expect(response.status).to eq(200) - expect(::JSON.parse(response.body).has_key?('wizard')).to eq(true) + expect(response.parsed_body.has_key?('wizard')).to eq(true) end end end diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb index a80f884812..f6249b275b 100644 --- a/spec/serializers/topic_view_serializer_spec.rb +++ b/spec/serializers/topic_view_serializer_spec.rb @@ -46,15 +46,35 @@ describe TopicViewSerializer do end describe '#image_url' do - let(:image_url) { 'http://meta.discourse.org/images/welcome/discourse-edit-post-animated.gif' } + let(:image_upload) { Fabricate(:image_upload, width: 5000, height: 5000) } describe 'when a topic has an image' do - it 'should return the image url' do - topic.update!(image_url: image_url) + before { topic.update!(image_upload_id: image_upload.id) } + it 'should return the image url' do json = serialize_topic(topic, user) - expect(json[:image_url]).to eq(image_url) + expect(json[:image_url]).to end_with(image_upload.url) + end + + it 'should have thumbnails' do + SiteSetting.create_thumbnails = true + + Discourse.redis.del(topic.thumbnail_job_redis_key(Topic.thumbnail_sizes)) + json = nil + + expect do + json = serialize_topic(topic, user) + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(1) + + topic.generate_thumbnails! + + expect do + json = serialize_topic(topic, user) + end.to change { Jobs::GenerateTopicThumbnails.jobs.size }.by(0) + + # Original + Optimized + expect(json[:thumbnails].length).to eq(2) end end diff --git a/spec/serializers/user_bookmark_serializer_spec.rb b/spec/serializers/user_bookmark_serializer_spec.rb index e97ebfe467..a192cae912 100644 --- a/spec/serializers/user_bookmark_serializer_spec.rb +++ b/spec/serializers/user_bookmark_serializer_spec.rb @@ -28,7 +28,9 @@ RSpec.describe UserBookmarkSerializer do expect(s.highest_post_number).to eq(1) expect(s.bumped_at).to eq_time(bookmark.topic.bumped_at) expect(s.slug).to eq(bookmark.topic.slug) - expect(s.username).to eq(bookmark.post.user.username) + expect(s.post_user_username).to eq(bookmark.post.user.username) + expect(s.post_user_name).to eq(bookmark.post.user.name) + expect(s.post_user_avatar_template).not_to eq(nil) end context "when the topic is deleted" do diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb index 9aa80e5011..2086c351ba 100644 --- a/spec/serializers/user_serializer_spec.rb +++ b/spec/serializers/user_serializer_spec.rb @@ -257,10 +257,10 @@ describe UserSerializer do end after do - User.plugin_public_user_custom_fields.clear + DiscoursePluginRegistry.reset! end - it "serializes the fields listed in plugin_public_user_custom_fields" do + it "serializes the fields listed in public_user_custom_fields" do expect(json[:custom_fields]['public_field']).to eq(user.custom_fields['public_field']) expect(json[:custom_fields]['secret_field']).to eq(nil) end diff --git a/spec/serializers/web_hook_topic_view_serializer_spec.rb b/spec/serializers/web_hook_topic_view_serializer_spec.rb index f0499f985e..df878fb7cb 100644 --- a/spec/serializers/web_hook_topic_view_serializer_spec.rb +++ b/spec/serializers/web_hook_topic_view_serializer_spec.rb @@ -50,6 +50,7 @@ RSpec.describe WebHookTopicViewSerializer do created_by last_poster tags + thumbnails } keys = serializer.as_json.keys diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb index d6e08a1a63..b2fa73c9e0 100644 --- a/spec/services/badge_granter_spec.rb +++ b/spec/services/badge_granter_spec.rb @@ -7,6 +7,15 @@ describe BadgeGranter do fab!(:badge) { Fabricate(:badge) } fab!(:user) { Fabricate(:user) } + before do + BadgeGranter.enable_queue + end + + after do + BadgeGranter.disable_queue + BadgeGranter.clear_queue! + end + describe 'revoke_titles' do it 'can correctly revoke titles' do badge = Fabricate(:badge, allow_title: true) @@ -269,10 +278,6 @@ describe BadgeGranter do fab!(:user) { Fabricate(:user) } fab!(:liker) { Fabricate(:user) } - before do - BadgeGranter.clear_queue! - end - it "grants autobiographer" do user.user_profile.bio_raw = "THIS IS MY bio it a long bio I like my bio" user.uploaded_avatar_id = 10 diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb index f5f0d14421..f3794d8bcb 100644 --- a/spec/services/post_alerter_spec.rb +++ b/spec/services/post_alerter_spec.rb @@ -1128,12 +1128,16 @@ describe PostAlerter do describe '#notify_post_users' do fab!(:topic) { Fabricate(:topic) } fab!(:post) { Fabricate(:post, topic: topic) } + fab!(:last_editor) { Fabricate(:user) } + fab!(:tag) { Fabricate(:tag) } it 'creates single edit notification when post is modified' do TopicUser.create!(user_id: user.id, topic_id: topic.id, notification_level: TopicUser.notification_levels[:watching], highest_seen_post_number: post.post_number) + PostRevisor.new(post).revise!(last_editor, tags: [tag.name]) PostAlerter.new.notify_post_users(post, []) expect(Notification.count).to eq(1) expect(Notification.last.notification_type).to eq(Notification.types[:edited]) + expect(JSON.parse(Notification.last.data)["display_username"]).to eq(last_editor.username) PostAlerter.new.notify_post_users(post, []) expect(Notification.count).to eq(1) diff --git a/spec/services/post_owner_changer_spec.rb b/spec/services/post_owner_changer_spec.rb index 1cee8eeae9..d2cf53b6ad 100644 --- a/spec/services/post_owner_changer_spec.rb +++ b/spec/services/post_owner_changer_spec.rb @@ -111,14 +111,12 @@ describe PostOwnerChanger do topic_count: 1, post_count: 1, first_post_created_at: p1.created_at, - topic_reply_count: 0 ) p2user.user_stat.update!( topic_count: 0, post_count: 1, first_post_created_at: p2.created_at, - topic_reply_count: 1 ) UserAction.create!(action_type: UserAction::NEW_TOPIC, user_id: p1user.id, acting_user_id: p1user.id, @@ -155,13 +153,11 @@ describe PostOwnerChanger do p1_user_stat = p1user.user_stat expect(p1_user_stat.first_post_created_at).to eq(nil) - expect(p1_user_stat.topic_reply_count).to eq(0) expect(p1_user_stat.likes_received).to eq(0) p2_user_stat = p2user.user_stat expect(p2_user_stat.first_post_created_at).to eq(nil) - expect(p2_user_stat.topic_reply_count).to eq(0) user_a_stat = user_a.user_stat diff --git a/spec/services/username_changer_spec.rb b/spec/services/username_changer_spec.rb index 0013c82a94..416c986ca9 100644 --- a/spec/services/username_changer_spec.rb +++ b/spec/services/username_changer_spec.rb @@ -142,7 +142,7 @@ describe UsernameChanger do post = create_post_and_change_username(raw: ".@foo -@foo %@foo _@foo ,@foo ;@foo @@foo") expect(post.raw).to eq(".@bar -@bar %@bar _@bar ,@bar ;@bar @@bar") - expect(post.cooked).to match_html(<<~HTML) + expect(post.cooked).to match_html(<<~HTML.rstrip)

.@bar -@bar %@bar @@ -164,7 +164,7 @@ describe UsernameChanger do post = create_post_and_change_username(raw: "**@foo** *@foo* _@foo_ ~~@foo~~") expect(post.raw).to eq("**@bar** *@bar* _@bar_ ~~@bar~~") - expect(post.cooked).to match_html(<<~HTML) + expect(post.cooked).to match_html(<<~HTML.rstrip)

@bar @bar @bar @@ -176,7 +176,7 @@ describe UsernameChanger do post = create_post_and_change_username(raw: "@foo. @foo, @foo: @foo; @foo_ @foo-") expect(post.raw).to eq("@bar. @bar, @bar: @bar; @bar_ @bar-") - expect(post.cooked).to match_html(<<~HTML) + expect(post.cooked).to match_html(<<~HTML.rstrip)

@bar. @bar, @bar: @@ -220,12 +220,8 @@ describe UsernameChanger do post = create_post_and_change_username(raw: "@foo @foobar @foo-bar @foo_bar @foo1") expect(post.raw).to eq("@bar @foobar @foo-bar @foo_bar @foo1") - expect(post.cooked).to match_html(<<~HTML) -

@bar - @foobar - @foo-bar - @foo_bar - @foo1

+ expect(post.cooked).to match_html(<<~HTML.rstrip) +

@bar @foobar @foo-bar @foo_bar @foo1

HTML end @@ -311,12 +307,8 @@ describe UsernameChanger do post = create_post_and_change_username(raw: "@թռչուն @թռչուն鳥 @թռչուն-鳥 @թռչուն_鳥 @թռչուն٩", target_username: 'птица') expect(post.raw).to eq("@птица @թռչուն鳥 @թռչուն-鳥 @թռչուն_鳥 @թռչուն٩") - expect(post.cooked).to match_html(<<~HTML) -

@птица - @թռչուն鳥 - @թռչուն-鳥 - @թռչուն_鳥 - @թռչուն٩

+ expect(post.cooked).to match_html(<<~HTML.rstrip) +

@птица @թռչուն鳥 @թռչուն-鳥 @թռչուն_鳥 @թռչուն٩

HTML end @@ -364,7 +356,7 @@ describe UsernameChanger do dolor sit amet RAW - expect(post.cooked).to match_html(<<~HTML) + expect(post.cooked).to match_html(<<~HTML.rstrip)

Lorem ipsum

{{i18n "admin.users.approved"}}