1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-26 07:44:49 +02:00
Commit Graph

13609 Commits

Author SHA1 Message Date
Deltik
7553ce1857 Fixed regression from 9563f8f
Don't _reconfigure() if no deployer active
2018-02-20 17:31:39 -06:00
Deltik
63386970d6 Test environment consistency fixes
git-clean in E107Base now runs first in _beforeSuite() so that tainted
files are not uploaded in Acceptance tests

E107Base::revokeLocalE107Config() now checks for file existence before
unlinking. XXX: Could remove this method if cleanVCS() proves reliable

Acceptance won't try to write an e107_config.php because the tests
themselves populate the configuration file
2018-02-20 14:36:24 -06:00
Deltik
5ce007e07b Merge branch 'master' of github.com:e107inc/e107-test 2018-02-20 13:29:37 -06:00
Deltik
9563f8f797 Fixed bug: _reconfigure()'d modules forgot config
Apparently, reconfiguring only applies to one test. This commit makes
all tests' modules reconfigured.

Introduced command to clean local app repo

InstallCest actually installs e107 now
2018-02-20 13:23:39 -06:00
Cameron
4cc6fa8d41 Merge branch 'master' of https://github.com/e107inc/e107-test 2018-02-19 13:49:14 -08:00
Cameron
0ec35cdf6c Quick tests for e_MEDIA_BASE and e_SYSTEM_BASE added. Disabled creation of e107_config.php (will halt installation test if found) 2018-02-19 13:48:45 -08:00
Cameron
e92c6789c5 Fix path of e_SYSTEM_BASE and e_MEDIA_BASE 2018-02-19 13:46:09 -08:00
Deltik
ec262c8fed Fixed indentation in some files 2018-02-19 15:19:56 -06:00
Deltik
eed4b6b10e Reenforced proper module access
\Helper\DelayedDb public methods shouldn't be used as Actor methods
2018-02-19 15:17:31 -06:00
Cameron
b9ddda1909 Merge branch 'master' of https://github.com/CaMer0n/phpunit 2018-02-17 16:29:18 -08:00
Cameron
edf296c940 additional install steps added. 2018-02-17 16:28:57 -08:00
Deltik
e25fdbf8ad Removed extraneous Db::_loadDump() 2018-02-17 04:11:26 -06:00
Cameron
84207d069b Merge branch 'master' of https://github.com/CaMer0n/phpunit 2018-02-16 15:42:39 -08:00
Cameron
38dd581c20 start of step 2 2018-02-16 15:42:29 -08:00
Deltik
e485b16d65 APP_PATH is now customizable in config.yml
Configuration option is "app_path" (string)
2018-02-16 17:32:07 -06:00
Deltik
a26721aff1 Git submodules use HTTPS URL now
Ideal for pulls and users who have not uploaded their SSH public key to
their GitHub account

Bit more of a hassle to those who code for e107 and normally push with
their SSH public key

Fixes: #2
2018-02-16 17:03:14 -06:00
Cameron
7ffb60c60b Make sure <option> has a value. 2018-02-16 13:34:54 -08:00
Cameron
1d5a70ab4b Install Step1-to-Step2 test. 2018-02-16 13:34:08 -08:00
Cameron
c62186cc7d Added PHPStorm .idea to gitignore. 2018-02-16 11:53:14 -08:00
Cameron
6445a29ad0 Update README.md 2018-02-16 10:54:15 -08:00
Deltik
10019cec74 Better local env config to avoid VCS conflicts
Local environments can now be configured with ./config.yml with a sample
configuration available in ./config.sample.yml
2018-02-16 07:04:03 -06:00
Deltik
ccb108d098 Tests for e_tree_model::prepareSimulatedPagination
https://github.com/e107inc/e107/issues/3034
2018-02-15 14:21:50 -06:00
Cameron
fd7b9e352e Merge pull request #3041 from Deltik/fix-3039
e_tree_model private methods are now protected
2018-02-15 12:18:54 -08:00
Deltik
0bbaaf4c6c Loose false check for e_tree_model sim. pagination
e_tree_model::prepareSimulatedPagination() did not correctly handle the
count-only condition because of an incorrectly written emptiness check.

Fixes: #3034
2018-02-15 13:59:13 -06:00
Deltik
a4b972cb9f e_tree_model private methods are now protected
Fixes: #3039
2018-02-15 13:45:40 -06:00
Deltik
dbaa444977 Generated e107_config.php supports remote SQL 2018-02-15 06:00:07 -06:00
Deltik
a18ca98f9a _beforeSuite() of modules called in \Helper\Base
f080402675 only works when a Deployer is
active, but local developers would not be using a Deployer.

For some reason (still unknown), the Codeception framework doesn't
execute _beforeSuite() for all the active modules, so \Helper\Base has
been coded to pick up the slack.

Actually fixes: #1
2018-02-15 05:35:47 -06:00
Deltik
11817896b4 Blanked out secrets.yml
Those credentials are invalid anyway
2018-02-15 05:09:47 -06:00
Cameron
2f62a522b7 Issue #3034 - Fix language-file not loading. 2018-02-14 14:13:37 -08:00
Deltik
f080402675 Reconfigured modules now run _beforeSuite()
Platform-independent SQL dump importing works now because
Helper\DelayedDb is now running _beforeSuite() after being reconfigured.

Fixes: #1
2018-02-14 13:43:24 -06:00
Cameron
be062da64d Merge pull request #3037 from Deltik/fix-3033
Fixes: #3033 Defers setting the SITEURL constant and dependencies until MySQL is connected
2018-02-13 08:23:52 -08:00
Deltik
d0acabcbe5 Added code coverage support and a unit test 2018-02-13 07:53:31 -06:00
Deltik
954a5bce2d Reordered README.md Quickstart
Should flow a bit more naturally now
2018-02-13 04:43:55 -06:00
Deltik
21acee0d12 Updated README.md with quickstart instructions 2018-02-12 17:42:14 -06:00
Deltik
34c8bf8afb Increased compatibility down to PHP 5.6
Removed dependencies installed by Composer
2018-02-12 15:10:27 -06:00
Deltik
b18ef3f830 Ready for testing!
e107 is now ready for fully automated testing on all three test suites:

* Acceptance
* Functional
* Unit

New features:

* cPanelDeployer adds a cPanel Remote MySQL access host
* e107 database dump importer
* Unit tests now load e107

Fixes:

* Test prefixes now only use characters valid for MySQL/MariaDB without
  escaping
* Refactored a bunch of things
* All existing tests pass now

Changes:

* Deployers now provided by \Helper\DeployerFactory
* Added Twig templating for generating e107_config.php for testing
* cPanelDeployer now outputs to codecept_debug()
2018-02-12 13:17:17 -06:00
Deltik
d1a69b0c16 Defers SITEURL and dependencies until SQL loaded
This is the least intrusive solution I could come up with.

Anything else I tried to reduce technical debt would break the very
tangled dependency web, so I settled for this.

Fixes: #3033
2018-02-12 06:54:15 -06:00
Cameron
de7fb1d1a0 Merge pull request #3032 from Deltik/fix-3029
Fixed critical regression introduced in b3a2740
2018-02-09 12:41:22 -08:00
Deltik
05c418cbda Fixed critical regression introduced in b3a2740
Oops.
2018-02-09 14:39:21 -06:00
Cameron
2823087d46 Merge pull request #3031 from Deltik/fix-3029
Implemented custom sorting for e_tree_model
2018-02-09 10:15:01 -08:00
Cameron
42b7121347 Issue #3030 NewForumPosts "main" BC Fix for top/bottom position. 2018-02-09 10:08:36 -08:00
rica-carv
c7083ef16f Merge pull request #49 from e107inc/master
.
2018-02-09 14:51:36 +00:00
Deltik
495145df61 Added automatic database support to all suites
Refactored by extracting code common to all suites to \Helper\Base

New \Helper\DelayedDb helper to delay initialization so that a new DSN,
username, and password can be loaded in dynamically for automatic
database provisioning.  Should still be compatible with manual database
information in codeception.yml
2018-02-09 06:45:23 -06:00
Deltik
b3a274010e Refactored e_tree_model for Code Climate 2018-02-09 05:40:53 -06:00
Deltik
2167a69a50 Record count no longer depends on subclass impl.
Subclasses may forget to run code to do a total record count, which
leads to output showing "Total Records: 0" on some pages with lists,
like `/e107_admin/links.php`.

This commit cuts out the record counting from the getList() method of
any e_admin_form_ui subclasses and the base class so that subclasses do
not have to reimplement record counting.

The caveat with this implementation is that it violates the Law of
Demeter, as evidenced by the new chained method call:

    $this->getController()->getTreeModel()->getTotal()

Jumping through two objects to get a value is not ideal, but this is the
code we have to work with at the moment.
2018-02-09 04:57:01 -06:00
Deltik
511bb9eae9 Implemented custom sorting for e_tree_model
In #3025, e_tree_model sorting was reimplemented in pure PHP, but this
broke custom sorting (like `?field=cat_name&asc=desc`).

This commit introduces a hack that simulates a subset of MySQL/MariaDB
ORDER BY clauses, which should be sufficient for all known custom
sorting that can be requested.

Tree formatting is always preserved, but custom sorting will apply for
all items at a certain depth under the same parent.

This commit also contains some minor formatting fixes and makes a minor
change to some regex to make use of non-capturing groups.

Fixes: #3029
2018-02-09 04:37:48 -06:00
Cameron
e045c6c91c Social plugin now provides social share links in admin after creating/updating a news item. 2018-02-08 15:44:08 -08:00
Deltik
ffadc38a96 Submodules now track their branch from remote 2018-02-08 10:16:37 -06:00
Deltik
fabfc67f1b Refactored cPanel Deployer: Defined components
cPanelDeployer is a bit easier to follow now that there is a concept of
components.
2018-02-08 10:07:03 -06:00
Deltik
a42025c5c6 First working acceptance test
Acceptance test checks the output of e107's /install.php on first load

Also added documentation on acceptance tests to README.md
2018-02-08 05:04:42 -06:00