DEV: remove qunit rails fork and add a couple of async tests

discourse · Apr 23, 2018 · 54d1530 · 54d1530
1 parent 0a44297
commit 54d1530
Show file tree

Hide file tree

Showing 9 changed files with 489 additions and 22 deletions.
diff --git a/Gemfile b/Gemfile
@@ -116,7 +116,6 @@ group :test, :development do
   gem 'certified', require: false
   # later appears to break Fabricate(:topic, category: category)
   gem 'fabrication', '2.9.8', require: false
-  gem 'discourse-qunit-rails', require: 'qunit-rails'
   gem 'mocha', require: false
   gem 'rb-fsevent', require: RUBY_PLATFORM =~ /darwin/i ? 'rb-fsevent' : false
   gem 'rb-inotify', '~> 0.9', require: RUBY_PLATFORM =~ /linux/i ? 'rb-inotify' : false

diff --git a/app/controllers/qunit_controller.rb b/app/controllers/qunit_controller.rb
@@ -0,0 +1,9 @@
+class QunitController < ApplicationController
+  skip_before_action :check_xhr, :preload_json
+  layout false
+
+  # only used in test / dev
+  def index
+    raise Discourse::InvalidAccess.new if Rails.env.production?
+  end
+end
diff --git a/app/views/qunit/index.html.erb b/app/views/qunit/index.html.erb
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>QUnit Test Runner</title>
+    <%= stylesheet_link_tag "qunit" %>
+    <%= stylesheet_link_tag "test_helper" %>
+    <%= javascript_include_tag "qunit" %>
+    <%= javascript_include_tag "test_helper" %>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <div id="qunit"></div>
+    <div id="qunit-fixture"></div>
+  </body>
+</html>
diff --git a/config/application.rb b/config/application.rb
@@ -75,6 +75,11 @@ def config.database_configuration
 
     config.assets.paths += %W(#{config.root}/config/locales #{config.root}/public/javascripts)
 
+    if Rails.env == "development" || Rails.env == "test"
+      config.assets.paths << "#{config.root}/test/javascripts"
+      config.assets.paths << "#{config.root}/test/stylesheets"
+    end
+
     # Allows us to skip minifincation on some files
     config.assets.skip_minification = []
 

diff --git a/config/routes.rb b/config/routes.rb
@@ -797,6 +797,10 @@
 
   get "/themes/assets/:key" => "themes#assets"
 
+  if Rails.env == "test" || Rails.env == "development"
+    get "/qunit" => "qunit#index"
+  end
+
   get "*url", to: 'permalinks#show', constraints: PermalinkConstraint.new
 
 end
diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js.es6
@@ -7,21 +7,20 @@ acceptance('Composer Actions', {
   }
 });
 
-QUnit.test('replying to post', assert => {
+QUnit.test('replying to post', async assert => {
   const composerActions = selectKit('.composer-actions');
 
   visit('/t/internationalization-localization/280');
   click('article#post_3 button.reply');
 
-  composerActions.expand();
+  await composerActions.expandAwait();
+
+  assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic');
+  assert.equal(composerActions.rowByIndex(1).value(), 'reply_as_private_message');
+  assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic');
+  assert.equal(composerActions.rowByIndex(3).value(), 'toggle_whisper');
+  assert.equal(composerActions.rowByIndex(4).value(), undefined);
 
-  andThen(() => {
-    assert.equal(composerActions.rowByIndex(0).value(), 'reply_as_new_topic');
-    assert.equal(composerActions.rowByIndex(1).value(), 'reply_as_private_message');
-    assert.equal(composerActions.rowByIndex(2).value(), 'reply_to_topic');
-    assert.equal(composerActions.rowByIndex(3).value(), 'toggle_whisper');
-    assert.equal(composerActions.rowByIndex(4).value(), undefined);
-  });
 });
 
 QUnit.test('replying to post - reply_as_private_message', assert => {

diff --git a/test/javascripts/acceptance/users-test.js.es6 b/test/javascripts/acceptance/users-test.js.es6
@@ -1,17 +1,13 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("User Directory");
 
-QUnit.test("Visit Page", assert => {
-  visit("/users");
-  andThen(() => {
-    assert.ok($('body.users-page').length, "has the body class");
-    assert.ok(exists('.directory table tr'), "has a list of users");
-  });
+QUnit.test("Visit Page", async assert => {
+  await visit("/users");
+  assert.ok($('body.users-page').length, "has the body class");
+  assert.ok(exists('.directory table tr'), "has a list of users");
 });
 
-QUnit.test("Visit All Time", assert => {
-  visit("/users?period=all");
-  andThen(() => {
-    assert.ok(exists('.time-read'), "has time read column");
-  });
-});
+QUnit.test("Visit All Time", async assert => {
+  await visit("/users?period=all");
+  assert.ok(exists('.time-read'), "has time read column");
+});
diff --git a/test/javascripts/helpers/select-kit-helper.js b/test/javascripts/helpers/select-kit-helper.js
@@ -105,6 +105,10 @@ function selectKit(selector) { // eslint-disable-line no-unused-vars
   };
 
   return {
+    expandAwait: function() {
+      return expandSelectKit(selector);
+    },
+
     expand: function() {
       expandSelectKit(selector);
       return selectKit(selector);