Commit graph

8734 commits

Author SHA1 Message Date
Jonne Hass
e95d841466 Nope it's just Hetzner having troubles again
Revert "can it be that enabling notifications broke the build?!"

This reverts commit 43437a8585.
2011-09-06 16:06:17 +02:00
Jonne Hass
43437a8585 can it be that enabling notifications broke the build?! 2011-09-06 15:56:12 +02:00
Sarah Mei
d0f6fe441f Try a different method of toggling aspects within cucumber features. 2011-09-06 06:35:08 -07:00
Jonne Hass
a6d5fe68cb no need to install firefox on travis anymore; no need to come up with
custom Xvfb init script anymore; lets try out travis notifications
2011-09-06 15:27:23 +02:00
Sarah Mei
8188816b1b Remove more ordering assumptions - this time in the ordering of aspects in the dropdown. Are we there yet? 2011-09-05 20:29:11 -07:00
Sarah Mei
6fbb68480b One more aspects.first removed. I think they're breeding 2011-09-05 19:28:10 -07:00
Sarah Mei
7d10b3fdb0 Remove more refs to aspects.first - should make postgres builds green 2011-09-05 19:04:56 -07:00
Sarah Mei
f06b8c7a58 First pass at removing order dependencies so specs will be reliable on postgres and mysql 2011-09-05 17:51:45 -07:00
Sarah Mei
0ec4d44cb4 Wait for aspect toggles in mention feature too 2011-09-05 17:10:58 -07:00
Sarah Mei
83384b08ea Wait for aspect toggles to return before looking for content 2011-09-05 16:50:16 -07:00
Sarah Mei
862fc15910 Refactor reshare feature 2011-09-05 16:28:33 -07:00
Sarah Mei
4ac6bd7d85 Refactor posts.feature, take out Scenario Outlines which seemed to causing issues on some systems 2011-09-05 16:16:02 -07:00
Sarah Mei
d646428a5e Clean up web steps that are too complicated to follow 2011-09-05 15:17:37 -07:00
Sarah Mei
22b65bd3c1 Mock out more jobs that might make outside calls 2011-09-05 14:31:00 -07:00
Sarah Mei
96d920c9d6 Refactor disconnecting feature - rename and remove redundant scenario that wasn't being run anyway 2011-09-05 14:00:55 -07:00
Sarah Mei
fa54b1dca2 Mock out pubsubhubbub in cucumber 2011-09-05 13:35:11 -07:00
Maxwell Salzberg
1e018885ed Merge branch 'rails3.10' 2011-09-05 13:28:31 -07:00
Maxwell Salzberg
7ff11188b6 update gemfile 2011-09-05 13:28:08 -07:00
Sarah Mei
cac4b1ba4e Ridiculously long cucumber timeout so we're more resiliant to travis traffic 2011-09-05 12:08:29 -07:00
Maxwell Salzberg
13eb7fbb7b forgot to remove js file from mobile assets 2011-09-05 11:03:57 -07:00
Maxwell Salzberg
a7602c4fd1 update jquery mobile 2011-09-05 10:51:36 -07:00
Jonne Hass
fa4695c7a8 Revert "fix travis button"
This reverts commit dca26ee3a3.
2011-09-05 19:06:01 +02:00
Maxwell Salzberg
dca26ee3a3 fix travis button 2011-09-05 10:03:36 -07:00
Jonne Hass
3b279d179f use env var to determine single process mode in scritp/server 2011-09-05 17:34:05 +03:00
Jonne Hass
b7b9cf6b6d fixed typo in script/server 2011-09-05 16:41:36 +03:00
Sarah Mei
2d6c2f0b60 Cucumber/spec cleanup. Removed some stray aspect.firsts, which should improve reliability across databases. Removed some cucumber steps we don't use & consolidated duplicate steps. 2011-09-04 23:15:08 -07:00
Sarah Mei
58161b006a Merge branch 'master' of github.com:diaspora/diaspora 2011-09-04 23:15:02 -07:00
danielgrippi
b6e2647530 remove sass warnings 2011-09-04 23:13:03 -07:00
Sarah Mei
5e388bf4c2 tag markdownify performance test so it isn't run on CI 2011-09-04 23:10:33 -07:00
Sarah Mei
abd8443181 Merge branch 'master' of github.com:diaspora/diaspora 2011-09-04 22:49:54 -07:00
danielgrippi
341d105e75 updated buttons, mixin declarations 2011-09-04 22:48:37 -07:00
Sarah Mei
e143fbf86e Only build the master branch on travis. 2011-09-04 22:43:17 -07:00
Sarah Mei
97d514dd65 Make connecting users in cucumber more deterministic. Should cut down on spurious failures in comment spec. 2011-09-04 21:50:52 -07:00
Sarah Mei
c678f4732c A bit of refactoring on person_spec since we got an odd failure on travis 2011-09-04 21:34:00 -07:00
Jonne Hass
c682eb8a7a updated locales 2011-09-05 02:30:30 +02:00
Maxwell Salzberg
192218f231 update readme language I did not care for; adding build status button from travisci. HUZZAH 2011-09-04 16:06:30 -07:00
Sarah Mei
83696a1d03 Add a ruby 1.8.7 (non-REE) build to travis 2011-09-04 15:06:01 -07:00
Sarah Mei
b1dc5f4aee Only delete cookies if running in an actual browser. 2011-09-04 13:14:32 -07:00
Sarah Mei
be3a46a23f Make posts.feature a little more reliable. The Scenario Outlines were sitting on the profile page as the background ran which may have been contributing to the System Exit problem. 2011-09-04 12:27:57 -07:00
Sarah Mei
5b54f84ad2 Clear cookies between features. 2011-09-04 12:26:58 -07:00
Sarah Mei
e3ee2102c9 Merge branch 'master' of github.com:diaspora/diaspora 2011-09-04 11:27:40 -07:00
Sarah Mei
ad009a71dc Don't run oauth.feature on travis, but run all features locally. 2011-09-04 11:27:30 -07:00
Jonne Hass
d1a5e627ba export DB in script/server 2011-09-04 19:51:24 +02:00
Sarah Mei
5e7ec82fe4 Moving jasmine into the test group only breaks the jasmine rake tasks, so move it back to both test & development. 2011-09-04 10:04:28 -07:00
Jonne Hass
6403cbded6 note to self: don't use debian manpages for ubuntu stuff… 2011-09-04 16:03:39 +02:00
Jonne Hass
19302078a2 improve aptitude command a bit 2011-09-04 15:55:45 +02:00
Jonne Hass
1a9e0162f9 really fix sed 2011-09-04 15:31:42 +02:00
Jonne Hass
6a268e08d6 fix sed in before-travis.sh 2011-09-04 15:21:07 +02:00
Jonne Hass
03110c466f use -q2 again for aptitude since -q3 doesn't seem to have any effect 2011-09-04 15:09:34 +02:00
Jonne Hass
835c4447f6 I just want to see if this works :P
- Removed launchy since I couldn't find any use of it
- Ruby 1.9 seems to need em-synchrony explictly
- No need to recreate the Gemfile.lock on Travis if proper :platforms
options are used in the Gemfile
- Removed group :development, :test and moved the stuff in the
corresponding sections
- Install adapter Gems according to the env var DB, install al if it is
unset
- Merged database.yml.postgres into database.yml.example. Bonus point:
easier switching between mysql and postgres
- May break everything but lets see what CI says
2011-09-04 14:53:28 +02:00