Merge remote-tracking branch 'upstream/pull/3200'

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4bf0f5f579fc498197404c14d37586d7fa16dbd9..d718dcfa793ffe5af9726ab7167a0782107c1eac 100644 (file)
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -33,4 +33,5 @@ jobs:
         curl -siL http://127.0.0.1:3000/api/0.6/node/1 | grep 'Null Island'
     - name: Test Complete Suite
       run: |
-        docker-compose run --rm web bundle exec rails test:db
+        docker-compose run --rm web bundle exec rails db:test:prepare
+        docker-compose run --rm web bundle exec rails test:all

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ee2a85862bbd7599c361af83b0136dc400230619..174b6b0d4b5144978d770d949e832821cd9d396d 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -66,7 +66,7 @@ jobs:
     - name: Install node modules
       run: bundle exec rake yarn:install
     - name: Run tests
-      run: bundle exec rake test:db
+      run: bundle exec rails test:all
     - name: Report completion to Coveralls
       uses: coverallsapp/github-action@v1.1.2
       with:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 568566c17ed8ba00e7019214486c7d864fe90a48..474c80b4f6eb3f6c6f293b8f47902f703ae7b3bc 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,7 +33,7 @@ functionality.
 You can run the existing test suite with:
 
 ```
-bundle exec rake test
+bundle exec rails test:all
 ```
 
 You can view test coverage statistics by browsing the `coverage` directory.

diff --git a/DOCKER.md b/DOCKER.md
index ce04309392f88d97391924c4a47c0b769c41e998..1def8b1cb4d729fc62ce2e0cdd030e94a7f961a5 100644 (file)
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -56,7 +56,7 @@ Run the Rails database migrations:
 
 Run the test suite by running:
 
-    docker-compose run --rm web bundle exec rake test:db
+    docker-compose run --rm web bundle exec rails test:all
 
 ### Loading an OSM extract
 

diff --git a/INSTALL.md b/INSTALL.md
index c8811fc3fcc54ccff2068765268a75b7438660b8..bd6603ebab5000c3a931cbb371652de42daafa78 100644 (file)
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -219,7 +219,7 @@ bundle exec rake db:migrate
 To ensure that everything is set up properly, you should now run:
 
 ```
-bundle exec rake test:db
+bundle exec rails test:all
 ```
 
 This test will take a few minutes, reporting tests run, assertions, and any errors. If you receive no errors, then your installation is successful.

diff --git a/VAGRANT.md b/VAGRANT.md
index ff4cb573761baf6ab55f82fa78b14b54fc3160cc..ed84eed57a823df9d000ac29a0d77979d224cb69 100644 (file)
--- a/VAGRANT.md
+++ b/VAGRANT.md
@@ -32,7 +32,7 @@ Within this login shell, you can do development, run the server or the tests. Fo
 
 ```
 cd /srv/openstreetmap-website/
-rake test
+bundle exec rails test:all
 ```
 
 To access the web pages you run the following commands then access the site in your [local browser](http://localhost:3000):
@@ -40,7 +40,7 @@ To access the web pages you run the following commands then access the site in y
 ```
 vagrant ssh
 cd /srv/openstreetmap-website/
-rails server --binding=0.0.0.0
+bundle exec rails server --binding=0.0.0.0
 ```
 
 You edit the code on your computer using the code editor you are used to using, then through shared folders the code is updated on the VM instantly.

diff --git a/config/locales/README b/config/locales/README
index e8dc83288dfa82c029b77d4f3e0e8dcb410f4ba5..136afb014a37e8985d2c6b36317c6ccb0567cd65 100644 (file)
--- a/config/locales/README
+++ b/config/locales/README
@@ -5,9 +5,9 @@ Do NOT edit any translations in here, please use translatewiki.net instead.
 The only file in this directory that should be edited by hand is en.yml, when
 localisation strings change or new translations are introduced. All other
 languages _need_ to be edited using translatewiki.net. Please make sure that you
-run the tests using *rake test* to make sure that there are no errors, as there
-is at least one test that makes sure that all translations are valid (we'll
-makes sure that they won't cause the site to not work).
+run the tests using *bundle exec rails test:all* to make sure that there are no
+errors, as there is at least one test that makes sure that all translations are
+valid (we'll makes sure that they won't cause the site to not work).
 
 There is more information about translating the website on the wiki at
 http://wiki.openstreetmap.org/wiki/Website_Internationalization.

diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
deleted file mode 100644 (file)
index 7205302..0000000
--- a/lib/tasks/testing.rake
+++ /dev/null
@@ -1,10 +0,0 @@
-task :test => :environment do
-  Rails::TestUnit::Runner.rake_run(["test/system"]) unless ENV.key?("TEST")
-end
-
-namespace :test do
-  task "lib" => "test:prepare" do
-    $LOAD_PATH << "test"
-    Rails::TestUnit::Runner.rake_run(["test/lib"])
-  end
-end