1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-23 14:44:29 +02:00
Commit Graph

13609 Commits

Author SHA1 Message Date
Cameron
5b9e2572a4 Test fixes. 2018-09-09 10:18:19 -07:00
Cameron
69aa6711e9 toGlyph tag cleanup 2018-09-09 10:16:55 -07:00
Nick Liu
8f38794e14 Merge branch 'master' of github.com:e107inc/e107-test 2018-09-09 01:18:48 -05:00
Nick Liu
3af03f1f5e Greatly improved robustness of E107Base
Fixed irreversible data loss bug when preparing the app path repo
for tests

OLD BEHAVIOR
Remove untracked files from the working tree before and after
every test suite. The intention was to remove files that could
have been created by the tests, but this also removes all other
untracked files, including third-party plugins and themes.

NEW BEHAVIOR
There is now a triple locking mechanism protecting the state of
the app repository before tests are run so that after tests have
run, all file contents are restored to how they were before the
tests have run.

There are three locks, each guarding a different part of the
original repo:

* file
* commit
* stash

When the file lock is present, E107Base knows that any other file,
tracked, untracked, or ignored, was created by the tested code.

The file lock is checked into the commit lock, which saves all
tracked and untracked files in the form of a commit. This way,
uncommitted code can be tested without manually making a commit that
includes the untracked files.

The stash lock saves all ignored files in a Git stash. Ignored files
go in a stash instead of in the commit lock because they can be a
confounding variable affecting the outcome of tests. They are usually
user-configurable only and may not represent tested states.

When the saving is complete, E107Base will have access to tracked and
untracked files but not ignored files. The tests are run in this
configuration.

After each test suite runs, the repo is reset and cleaned to return
the files to the same state they were in before the test suite began.

Then, the locks are undone first by rolling back the commit lock,
which restores the originally uncommitted tracked and untracked
files. Next, the stash lock is popped, restoring the originally
ignored files. Finally, the file lock is removed, signifying that the
repo is back to its original data before the test suite was run.

In case of an ungraceful exit, at least one of the locks would be
left in the repo. The next time E107Base runs, locks are checked, and
if one or more are present, the repo is restored before the locks are
reestablished.

If the `git` command is inoperative, only the file lock is operative
and does nothing more than signify a test that is in progress or has
exited unexpectedly. Data protection is silently unenforced. This can
lead to unexpected tracked, untracked, and ignored file modifications
that will not be rolled back after a test suite has run.
2018-09-09 01:18:09 -05:00
Cameron
bc29ef1efe Removed buggy value unserialize test. 2018-09-08 13:44:07 -07:00
Cameron
7340ea8377 Media-Manager icon picker preview size fix. 2018-09-08 11:53:40 -07:00
Cameron
f19817f8b3 Media-Manager Fix for icon/glyph filtering. 2018-09-08 11:37:39 -07:00
Cameron
44513d2a65 Fix for extended user fields not saving in user_extended in the case where the record is missing from the table. 2018-09-08 11:19:16 -07:00
Cameron
a1c38cb364 PHP Notice removal 2018-09-08 10:45:18 -07:00
Cameron
5ee15f10ef Allow title to be set in toGlyph() 2018-09-08 10:27:06 -07:00
Cameron
a661709164 Merge pull request #3400 from yesszus/patch-1
Update social_xurl_template.php
2018-09-07 11:54:31 -07:00
Cameron
adf4d67609 Merge pull request #3417 from newbthenewbd/patch-2
Fix language editor wrongly parsing HTML entities
2018-09-07 11:53:42 -07:00
Cameron
e34e4740c5 Admin-ui Make readonly/disabled inputs more obvious. 2018-09-06 11:21:17 -07:00
Cameron
b5157e70cb Fixes #3422 Installation issue with database names containing a hyphen. 2018-09-06 11:20:43 -07:00
Cameron
cdcd10e7f5 Fix for blog-calendar links not in the current year. 2018-09-04 17:10:03 -07:00
Newb I the Newbd
26820c5ddf Fix language editor wrongly parsing HTML entities 2018-09-05 01:38:36 +02:00
Cameron
aef5a04e00 More admin-ui tests and separate inline checks. (very basic right now) 2018-09-04 15:26:29 -07:00
Cameron
00e2663162 Added token to x-editable 2018-09-04 15:15:50 -07:00
Cameron
a6cb884277 Merge pull request #3416 from newbthenewbd/patch-1
Fix ampersand handling in the legacy rating method
2018-09-04 09:07:47 -07:00
Newb I the Newbd
37b4120c5c Fix ampersand handling in the legacy rating method 2018-09-04 03:28:36 +02:00
Cameron
937af7595e Partial fix for Issue #3386 - TinyMce with Appearance params. 2018-09-03 17:48:55 -07:00
Cameron
c360ba2476 PHPDoc fix 2018-09-03 15:22:04 -07:00
Cameron
7daded6ac5 Media-Picker spacer fix. 2018-09-03 14:35:03 -07:00
Cameron
b09beceb4e Merge pull request #3404 from SimSync/fix_3375
Fixes #3375 Added GDPR Agreement checkbox to contact form (incl. Lans)
2018-09-03 12:09:26 -07:00
Cameron
b443409c3a PHPDoc fixes on e107_class.php 2018-09-03 12:08:44 -07:00
Cameron
8e663dbf74 admin-ui improved inline-editing debugging log information. 2018-09-03 11:43:44 -07:00
Nick Liu
5a8e4e166f Initial integration with GitLab CI 2018-08-29 15:58:17 -05:00
Achim Ennenbach
97aa3fb560 adapted shortcode to the new pref name gpdr_privacypolicy 2018-08-28 12:29:20 +02:00
Achim Ennenbach
72897dcc17 Added new pref section GPDR and moved the "privacy policy" pref to this section
Added another pref for "terms and conditions"
2018-08-28 12:28:41 +02:00
Achim Ennenbach
c0557966ec Moved new prefs from update_routines.php to default_install.xml 2018-08-28 10:23:55 +02:00
Achim Ennenbach
986633d117 fixes #3375 added GDPR Agreement checkbox to contact form (incl. Lans) 2018-08-27 20:12:54 +02:00
Achim Ennenbach
c165fad9f0 Added new pref for a privacy policy url in contact forms (incl. Lans) 2018-08-27 20:11:55 +02:00
Achim Ennenbach
c176389f34 Added update routine from 2.1.9 to 2.2.0 2018-08-27 20:10:31 +02:00
Nick L
fc96dd5281 Merge pull request #12 from SimSync/fix_11
fixes #11 Typo in assertEquals
2018-08-27 09:58:28 -05:00
Achim Ennenbach
4fca8150d0 fixes #11 Typo in assertEquals 2018-08-27 15:39:59 +02:00
Cameron
adce28a1f5 MediaPicker preview fix. 2018-08-26 15:36:05 -07:00
Cameron
e392fd5740 Fix for drag-n-drop upload. 2018-08-26 15:27:59 -07:00
Cameron
f958f66dcb Issue #2669 Incorrect FB og:image used. Issue #6 LAN modified. 2018-08-26 13:54:25 -07:00
Cameron
d4834c43e9 Pages: display '_common' images in media-manager selection. 2018-08-26 12:29:54 -07:00
Cameron
9fc35e190c Fixes #3386 TinyMce wasn't inserting image correctly when pref "resize dimension" width was empty. Fixed TinyMce cancel button. 2018-08-26 12:29:42 -07:00
Cameron
db976c931b Merge pull request #3396 from SimSync/fix_3359
fixes #3359 changed default redirect code from 302 to 301 for better seo compatibility
2018-08-26 10:36:55 -07:00
Cameron
2153b43ebd Merge pull request #3402 from SimSync/fix_3390
fixes #3390 Added check for "//" at the beginning for protocol-less path
2018-08-26 10:36:40 -07:00
Cameron
4fa0b4f13f Merge pull request #3401 from SimSync/fix_3394
fixes #3394 Moved loading of e_bb after the loading of the templates
2018-08-26 10:36:25 -07:00
Cameron
2bd651c630 Fixes #2593, Fixes #1586 User-extended 'database' field options were not being saved. 2018-08-26 10:23:55 -07:00
Achim Ennenbach
f08a323f05 fixes #3390 Added check for // at the beginning for protocol-less path 2018-08-26 13:51:16 +02:00
Achim Ennenbach
3840d7d642 fixes #3394 Moved loading of e_bb after the loading of the templates 2018-08-26 13:38:14 +02:00
Gábor
dcc342885d Update social_xurl_template.php
Open lonks on a new tab.
2018-08-26 09:05:14 +02:00
Cameron
7c7f636f3c Check TinyMce is installed after installations. 2018-08-25 15:32:11 -07:00
Cameron
97772a48d9 PHP Minimum set to 5.6. TinyMce installed by default. 2018-08-25 15:31:39 -07:00
Cameron
3d031895ca Dropzone LAN added. Catch theme shortcode when set in sitelinks but missing and add a debug message. 2018-08-24 16:04:12 -07:00