Brenda Wallace
bbc19a5436
Array indentation fixed
2016-11-26 11:49:51 +13:00
Brenda Wallace
d268d2b09e
Fixed indentation on comments
2016-11-26 11:45:25 +13:00
Brenda Wallace
c878baa886
Indented parameters cleanup
2016-11-26 11:41:07 +13:00
Brenda Wallace
564731667e
Fixed up all remaining hash alignment
2016-11-26 11:17:42 +13:00
Brenda Wallace
5f3dd04068
Fixed array indentation
2016-11-26 11:00:49 +13:00
Brenda Wallace
83392ddda1
Indentation clean ups
2016-11-26 10:51:54 +13:00
Brenda Wallace
be67b858b4
Merge remote-tracking branch 'upstream/dev' into bw/long-lines-fixed
...
Conflicts:
lib/tasks/growstuff.rake
2016-11-25 08:18:18 +13:00
Brenda Wallace
dac2343b68
Further code duplication reduction
2016-11-20 21:18:07 +13:00
Brenda Wallace
f24e02fd11
reduced code duplication again in photos cont spec
2016-11-20 21:13:57 +13:00
Brenda Wallace
dddc7b020d
Corrected description in spec
2016-11-20 21:13:33 +13:00
Brenda Wallace
12a9a0b97d
one more check no alert was generated
2016-11-20 21:13:08 +13:00
Brenda Wallace
6a8f48693b
Reduce code duplication in photos cont spec
2016-11-20 21:12:43 +13:00
Brenda Wallace
50a0668c1d
Check no alert message was generated
2016-11-20 21:11:54 +13:00
Brenda Wallace
a7e88a55b3
Spec for trying to attach photo when not allowed.
2016-11-20 21:03:08 +13:00
Brenda Wallace
d0a1a113b6
Multi-line block changed from {} to do end
2016-11-20 20:29:01 +13:00
Brenda Wallace
a8bffd3bce
White space fix in spec
2016-11-20 20:28:34 +13:00
Brenda Wallace
f6aac07c3d
Flatten params passed in photos controller spec
2016-11-20 20:27:59 +13:00
Brenda Wallace
72f1d83af4
Removed a bunch of blank lines
2016-11-20 20:19:14 +13:00
Brenda Wallace
917e33bccf
Merge remote-tracking branch 'upstream/dev' into bw/long-lines-fixed
2016-11-20 19:24:53 +13:00
Brenda Wallace
2872a1c29d
Wrapped all long lines.
...
reduced rubocop's line length limit to 120
2016-11-17 22:02:18 +13:00
Brenda Wallace
5e0cff5b8e
Merge remote-tracking branch 'upstream/dev' into bw/covert-tabs-to-spaces
...
Conflicts:
app/helpers/seeds_helper.rb
spec/support/controller_macros.rb
2016-11-17 19:04:44 +13:00
Brenda Wallace
5ec2877577
Covert all tabs to spaces
2016-11-16 13:18:26 +13:00
Brenda Wallace
6bd9bd98d9
Removed extra blank lines, & added a end of file
2016-11-16 12:52:48 +13:00
Brenda Wallace
0475954acf
Removed extra blank lines
2016-11-16 12:50:14 +13:00
Brenda Wallace
bdb057ca0f
Removed all trailing white space
2016-11-14 15:05:32 +13:00
Brenda Wallace
faf117b002
test for link to member's harvest
2016-09-19 18:02:44 +12:00
Daniel O'Connor
36c64bd8dc
#1038 Add links to OpenFarm
2016-09-14 14:57:08 +09:30
Daniel O'Connor
29765ebc19
rubocop --only HashSyntax --auto-correct
2016-08-22 19:02:27 +09:30
Daniel O'Connor
0f034523e1
Only maximize if the driver supports such a thing
2016-08-22 18:26:08 +09:30
Daniel O'Connor
bcb0a19dea
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-22 16:37:50 +09:30
Daniel O'Connor
4e2311e8d7
Indent
2016-08-22 16:36:30 +09:30
Daniel O'Connor
1c3016a31e
Adjust for when running with selenium-webdriver to avoid clicks being placed in the wrong location; and for drivers that don't support blacklisting
2016-08-22 16:17:36 +09:30
Daniel O'Connor
4b066ec37f
Merge pull request #1028 from CloCkWeRX/minor_gem_upgrades_august_2016
...
Minor gem upgrades for August 2016
2016-08-15 23:28:30 +09:30
Daniel O'Connor
7f6a1a424d
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-15 23:13:55 +09:30
Daniel O'Connor
711ba73d6b
Upgrade devise to 4.2
2016-08-15 22:12:34 +09:30
Daniel O'Connor
e4c0ecfb5a
Add basic test
2016-08-15 21:30:40 +09:30
Daniel O'Connor
ff47784aee
Add explicit test coverage
2016-07-21 12:21:56 +09:30
Daniel O'Connor
1dba711057
Add more explicit test coverage
2016-07-21 12:13:37 +09:30
Daniel O'Connor
43e7d6f7c2
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-07-05 03:09:36 +09:30
Daniel O'Connor
c3d9885525
Merge pull request #987 from CloCkWeRX/upgradazzle_rails
...
Upgrade to rails 4.2.0+ (round 2)
2016-06-29 14:47:05 +09:30
Mackenzie Morgan
7a53e96d52
test the default case
2016-06-19 22:52:51 -04:00
Mackenzie Morgan
b28d146de7
use default of info
...
add tests
2016-06-19 22:42:20 -04:00
Miles Gould
1b07632c69
Block external URLs in features
...
https://github.com/teampoltergeist/poltergeist/issues/375#issuecomment-42620085
suggested that this might help with our intermittent "Request to
http://localhost:8081 failed to reach server, check DNS and/or server
status" errors in CI - the theory being that the error message is
misleading, and it's actually a daughter request to an external service
timing out. Seems worth a shot. It also ought to speed up testing, but
the effect is slight (20s out of 3.5 minutes) on my machine.
I've blacklisted only URLs I could find in app/views or by tcpdumping a
test run, because I couldn't get whitelisting to work.
2016-06-17 21:12:25 +01:00
Daniel O'Connor
0620646c6d
Fix failing specs
...
- Updated assert_select behaviour given this is now based on nokogiri
- Adjust some specs not to look for a specific asset name, but a behaviour
- Adjust some specs for HTML5 style attributes instead of xhtml style
- Fix tests that did not render before
2016-06-10 16:01:30 +09:30
Daniel O'Connor
7fe75ee52a
Fix DEPRECATION WARNING: #deliver is deprecated.
2016-06-10 15:45:01 +09:30
Lucas Nogueira
9ce097b7d6
Fix SimpleCov Deprecation Warning
2016-06-09 17:42:11 -03:00
pozorvlak
b03ccce575
Merge pull request #980 from lucasnogueira/replace_pluralize
...
Replace pluralize calls
2016-06-09 16:39:34 +01:00
Lucas Nogueira
5dbd5bc1d2
Correct minor typos
2016-06-09 08:21:28 -03:00
Lucas Nogueira
905710b6e9
Helper for plural localization
2016-06-08 21:55:33 -03:00
pozorvlak
936aa17ecc
Remove references to vendor directory
...
This consisted of instructions to various code-quality tools to
ignore it.
2016-06-07 17:43:36 +00:00
Brenda Wallace