Maxwell Salzberg
a36d5558db
use merge not merge! so we dont create false user objects
2012-04-05 11:42:32 -07:00
Florian Staudacher
90387e83f8
speed up cukes by deferring GC
...
-> https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection
this speeds up tests from 9min 47sec to 9min 16sec on my machine
(6% improvement)
2012-04-05 16:01:58 +02:00
Florian Staudacher
118ae2d657
refactored show-page comment cuke to be like normal comment cuke
2012-04-04 15:23:39 +02:00
Maxwell Salzberg
78146a95d9
try a much longer wait time and see if that makes things pass on travis :*(
2012-04-03 23:03:11 -07:00
Maxwell Salzberg
cf3776fde2
remove webmock from cucumber to try and fix the travis timeout errors :(
2012-04-03 22:16:51 -07:00
Maxwell Salzberg
ef74a06d85
reduce timeout to maybe get cukes to pass
2012-04-03 18:04:08 -07:00
Maxwell Salzberg
0986e412de
well that didnt work... Revert "try reconnecting after every cuke for postgres only to try and deal with travis issues"
...
This reverts commit 1604aedf03 .
2012-04-03 17:59:51 -07:00
Maxwell Salzberg
1604aedf03
try reconnecting after every cuke for postgres only to try and deal with travis issues
2012-04-03 17:27:28 -07:00
danielgrippi
5459d07339
bump capybara timeout to avoid timeout errorsdefine cucumber step to be pending so travis doesn't freak out
2012-04-03 16:43:44 -07:00
danielgrippi
3bc3f13651
upgrade backbone, fix tests
...
some cukes may be failing non deterministically, I think, do we bump the cuke timeout?
2012-04-03 16:31:52 -07:00
Maxwell Salzberg
adf85e1ec6
adding a bit to tubbo's spork branch
2012-03-31 01:22:46 -04:00
Maxwell Salzberg
8e0998ab88
make cukes' wait until use block form, as we were getting some weird parse errors otherwise
2012-03-31 00:15:55 -04:00
Dennis Collinson
34bdc09763
simplify env.rb for great justicethe jquery hack was messing up cukes, killed that
2012-03-29 11:51:32 -07:00
Maxwell Salzberg
402694e516
fixing cukes
2012-03-28 14:47:28 -07:00
Steven Hancock
1aa0b15c8c
Move Javascript to the asset pipeline
...
* Move all Diaspora-specific javascripts to app/assets/javascripts
* Move all vendored javascripts to vendor/assets/javascripts
* Add the appropriate Sprockets require directives to make sure
everything gets included in the right order
* Remove Jammit dependencies
* Fix all templates that were using Jammit's include_javascripts helper
* Add handlebars_assets gem for compiling Handlebars templates
* Move all Handlebars templates to app/assets/templates and rename
from .handlebars to .jst.hbs (this is to keep them in the same
global JST namespace that they were in under Jammit)
* Add public/assets to .gitignore since these files can and should
be re-generated by Heroku or Capistrano during each deploy
* Fix a few Handlebars templates that were looking for images in the
wrong location (I'm sure there are others, but it's late)
* Configure application.rb to precompile all javascript and css assets
that were compiled by Jammit in the Rails 3.0 code
2012-03-27 18:07:44 -07:00
danielgrippi
f72f1d4059
more progress
2012-03-27 18:07:22 -07:00
Maxwell Salzberg
2e1f353ac4
Merge branch 'show-more' of https://github.com/Raven24/diaspora into Raven24-show-more
...
Conflicts:
public/javascripts/app/views/content_view.js
2012-03-19 19:11:57 -07:00
Maxwell Salzberg
6b97b8044b
small updates, and it looks like we are mostly working
2012-03-16 17:56:35 -07:00
Florian Staudacher
27997e9525
refactored test method into helpers
2012-03-16 22:25:53 +01:00
Dennis Collinson
9769dfb303
cukes passing
2012-02-23 17:24:19 -08:00
Dennis Collinson
8d2376b3bf
just sleep
2012-02-23 12:53:05 -08:00
danielgrippi
37981b71fe
MS; DG; adding cucumbers for post templates
2012-02-21 17:31:26 -08:00
danielgrippi
f3f2b8ca44
change routes to properly reflect page names (activity/stream).
2012-02-14 11:16:41 -08:00
danielgrippi
32f93a0391
you can now follow / unfollow a post from the stream; fixed cukes.
2012-02-13 19:13:43 -08:00
Maxwell Salzberg
62b222020d
allow localhost in cukes
2012-02-09 17:54:56 -08:00
Maxwell Salzberg
7109cf6c67
mock out slow things that our tests dont need for speed
2012-02-09 17:44:32 -08:00
danielgrippi
84eb313e20
updated routes to reflect page titles (explore/participate)
2012-02-08 14:40:28 -08:00
Dennis Collinson
558ceec92a
a user can mark themselves as nsfw
2012-02-07 19:03:20 -08:00
Dennis Collinson
a399572995
MS DC; fix participate stream ordering problem that was putting new posts on the bottom of things
2012-02-06 16:51:32 -08:00
Dennis Collinson
578e8ef269
broken
2012-02-06 14:55:14 -08:00
Maxwell Salzberg
4382d45e82
almost failing cuke
2012-02-06 12:25:02 -08:00
danielgrippi
4f7dda6012
bang! kill redis cache.
2012-02-02 12:45:43 -08:00
danielgrippi
ebab307b3d
fix require in cucumber
2012-02-01 16:47:32 -08:00
danielgrippi
bfe0b7129c
move all stream actions into PostController
2012-01-17 15:53:06 -08:00
Maxwell Salzberg
a1b389c365
SM MS; stub jquery in cukes, cleanup env.rb
2012-01-07 13:07:45 -08:00
Jonne Hass
8f13f2182e
ensure the expected port is actually used by cucumber
2011-12-10 12:54:39 +01:00
danielgrippi
f4c9b548f9
update cucumber and capybara. one failing cuke.
2011-12-07 18:40:39 -08:00
Daniel Grippi
083bb8fbbf
remove patch for db cleaner (version bump seemed to resolve it)
2011-12-05 23:50:50 -08:00
Sarah Mei
81476b79ca
The home page is now /stream
2011-11-25 03:54:47 -08:00
Gonzalo Rodriguez
0de6512789
Decrease cukes default wait time
...
This will not fix cukes, but at least travis is going
to throw failures output instead of timing out
2011-11-22 00:18:14 -02:00
pivotalcommon
52aaf33296
Merge pull request #2402 from 21echoes/cuke_path_fix
...
minor error in features/paths.rb regarding the recent split of posts and photos
2011-11-14 17:43:19 -08:00
David Kettler
79da38d929
now that photos are not posts, we gotta send posts to the post path in cucumber tests
2011-11-14 17:14:10 -08:00
Sarah Mei & Tim Frazer
ebad0f5ec3
Don't try to follow diasporahq during cucumber tests
2011-11-14 16:55:59 -08:00
danielgrippi
b46200224e
cukes are green again
2011-10-17 17:45:45 -07:00
Manuel Schölling
bdeae54c6c
Make Photos not inherit from Posts
2011-10-16 13:58:35 +02:00
Maxwell Salzberg
8029cb0784
SM MS basic api wip. able to get a users public profile
2011-10-15 18:57:13 -07:00
Pistos
b6288f841b
Allow Cucumber tests to run with PostgreSQL with a non-root user.
2011-10-11 16:54:03 -04:00
danielgrippi
ba8e50e34c
DG MS; renamed a file; fixed the build
2011-09-15 15:16:34 -07:00
danielgrippi
91e649977c
MS DG update copyright
2011-09-14 11:23:12 -07:00
Sarah Mei
22b65bd3c1
Mock out more jobs that might make outside calls
2011-09-05 14:31:00 -07:00