Commit graph

689 commits

Author SHA1 Message Date
Dennis Collinson
e16a20e18c toggle all nsfw posts 2012-02-14 14:15:24 -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
danielgrippi
44e072c330 DC DG; a participation is created in StatusMessageController 2012-02-10 16:42:21 -08:00
Maxwell Salzberg
1c314c9540 return to diaspora after oauth cukes to prevent failures [ci skip] 2012-02-09 18:52:57 -08:00
danielgrippi
5a4f9d5b99 fix cuke 2012-02-09 18:03:41 -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
e6e49bbf1f stubbornella media and img dom structure FTW! major css deletion <3 2012-02-09 14:29:01 -08:00
Maxwell Salzberg
ceb0a15a84 update participate path in cuke 2012-02-09 10:52:53 -08:00
Dennis Collinson
74409d64b5 cleanup, yoq 2012-02-08 17:25:25 -08:00
Dennis Collinson
94a7f5bb91 unsfw - sorry Kinky Joe! 2012-02-08 16:35:55 -08:00
danielgrippi
84eb313e20 updated routes to reflect page titles (explore/participate) 2012-02-08 14:40:28 -08:00
Dennis Collinson
8ae18bb393 nsfw's users posts are now nsfw 2012-02-07 19:14:44 -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
Maxwell Salzberg
c7d422c338 fix cukes 2012-02-01 15:12:18 -08:00
Sarah Mei
0bb6ff99c9 Fix commenting in notification feature 2012-01-27 19:56:40 -08:00
Sarah Mei
1a30ef62a6 Fix comment feature 2012-01-27 19:21:27 -08:00
Dennis Collinson
18cd151456 cuke fix 2012-01-23 19:32:15 -08:00
Maxwell Salzberg
49f18d435a upgrade factory girl there are 3 failing cukes. 2012-01-21 21:58:50 -08:00
Maxwell Salzberg
30947778f9 remove stray api feature 2012-01-17 17:33:55 -08:00
danielgrippi
339c47d782 moved stream logic into its own controller (StreamsController) 2012-01-17 15:53:06 -08:00
danielgrippi
bfe0b7129c move all stream actions into PostController 2012-01-17 15:53:06 -08:00
Maxwell Salzberg
2cbfe75686 make this spec WIP, as there is a larger problem with hidden posts that is addressed in teh hidden posts branch that is soon to be merged in 2012-01-13 13:34:32 -08:00
danielgrippi
36e13893a3 fix closes account feature 2012-01-07 14:57:44 -08:00
danielgrippi
c3ea1dfc6e DC DG fix search cucumber step 2012-01-07 14:24:27 -08:00
danielgrippi
3db0cd3776 fix all cukes but the tags feature [ci skip] 2012-01-07 14:24:27 -08:00
danielgrippi
933299e31c added translations to templates; mock out the locale file in jasmine 2012-01-07 14:23:28 -08:00
Dennis Collinson
7ccc81b0a4 fix conversations cuke 2012-01-07 14:23:28 -08:00
danielgrippi
5e28c8f6ec fix backing out of photo-only post cuke 2012-01-07 14:23:27 -08:00
danielgrippi
dbfb18e249 display reshare counts; test inf scroll & reshare counter in jasmine instead of cucumber 2012-01-07 14:23:27 -08:00
danielgrippi
71bae10317 fixed notification specs; removed a cuke around reshares already tested in jasmine 2012-01-07 14:23:27 -08:00
danielgrippi
f804db36b8 DG DH; fix most of the cukes (7 failures left) 2012-01-07 14:23:26 -08:00
danielgrippi
bc0c92ec64 added inf. scroll to stream; passing inf. scroll cukes 2012-01-07 14:23:26 -08:00
danielgrippi
565a0b21f7 fix .avatar declaration in the header template; make socketing always return nil straight away (we are not using the websocket in this branch, and it makes everything faster when it's off) 2012-01-07 14:23:26 -08:00
danielgrippi
bbc7db3152 fixed follows_tags.feature 2012-01-07 14:23:26 -08:00
danielgrippi
52183b8cc4 fix name in header; 27 failures 2012-01-07 14:23:25 -08:00
danielgrippi
039df8f879 fixed 14 cukes (all comments features) 2012-01-07 14:23:25 -08:00
Maxwell Salzberg
a1b389c365 SM MS; stub jquery in cukes, cleanup env.rb 2012-01-07 13:07:45 -08:00
danielgrippi
f395a707ea destroy cookies instead of visiting a controller action for signing out (thx sarahmei) 2012-01-06 23:28:23 -08:00
danielgrippi
2dd0012d1e update some gems (selenium, rspec-core, heroku, cucumber, fog, fb, etc) 2012-01-06 22:33:55 -08:00
danielgrippi
2e3b8f9d53 speed up cucumber 2012-01-05 22:41:05 -08:00
danielgrippi
aac97303ce removed duplicate line in a feature [ci skip] 2011-12-20 12:59:15 -08:00
danielgrippi
4ae0dcec43 fix notifications cucumber features 2011-12-20 12:30:29 -08:00
Sarah Mei
3c8b26b051 refactor infinite scroll features to take less time 2011-12-11 17:14:23 -08:00
Sarah Mei
78f4758d6d Collapsing some cucumber features to save time. Removing features that should be tested elsewhere in the stack. 2011-12-11 15:08:43 -08:00
Jonne Hass
5726b37fb9 diaspora connect: fix edge case where pod lost the client information 2011-12-11 01:37:15 +01:00
Jonne Hass
559016af7e oh well, touching Capybara.app_host resets the session 2011-12-10 20:53:19 +01:00
Jonne Hass
8f13f2182e ensure the expected port is actually used by cucumber 2011-12-10 12:54:39 +01:00
Jonne Hass
8b141ed5d5 oauth feature green, except for the pod forgot client edge case 2011-12-10 12:54:39 +01:00
Maxwell Salzberg
af7962e2e8 fix photo feature 2011-12-09 13:52:32 -08:00
danielgrippi
342593988b MS DG; fixed close account cukes 2011-12-08 16:32:20 -08:00
Maxwell Salzberg
455e5375d8 add 1.9.3 to travis. remove deprecation warning from cukes 2011-12-08 16:30:58 -08:00
danielgrippi
f4c9b548f9 update cucumber and capybara. one failing cuke. 2011-12-07 18:40:39 -08:00
danielgrippi
f40ed9bb25 DG MS; remove deprication warning in cukes 2011-12-07 17:32:09 -08:00
Daniel Grippi
083bb8fbbf remove patch for db cleaner (version bump seemed to resolve it) 2011-12-05 23:50:50 -08:00
Daniel Grippi
0d41c9c5f3 update gems -- mainly omniauth (we explicitly include omniauth libs now... much cleaner) 2011-12-05 19:53:03 -08:00
Gonzalo Rodriguez
77d30949a0 Refactor some cucumber steps 2011-12-03 23:09:51 -02:00
Sarah Mei
a594d8f7ce Fix cucumber log in and close account feature 2011-11-25 04:48:47 -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
Manuel Schölling
335a7b4ebe Modified session steps to work with /public/index.html 2011-11-16 20:25:54 +01: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
Pistos
d87c0a9b44 Don't assume specific translation for aspects title. 2011-11-10 11:20:31 -05:00
Pistos
3e689ec988 Whitespace cleanup. 2011-11-10 11:20:24 -05:00
Jonne Hass
919b010e06 fix step definition 2011-11-10 15:05:32 +01:00
Jonne Hass
188f429998 Merge branch 'issue1924-cucumber-tests' of https://github.com/Gonzih/diaspora
Conflicts:
	features/posts_from_main_page.feature
	features/step_definitions/custom_web_steps.rb
2011-11-10 14:45:00 +01:00
Ilya Zhitomirskiy
d1d24a049c added close buttons which clear getting started when they're all closed 2011-11-07 21:59:29 -08:00
Sarah Mei
ac065e1706 Differentiate between oauth features and non-oauth features for travis. 2011-11-05 21:09:56 -07:00
Jonne Hass
9ee3b2d080 improved closing account experience and fixed the cuke 2011-11-05 11:30:21 +01:00
danielgrippi
0ab23f337a fixed all cukes; view bugs on streams 2011-11-03 12:31:24 -07:00
danielgrippi
1ac5c7af62 fixed some cukes 2011-11-03 12:31:24 -07:00
Dan Hansen & Maxwell Salzberg
0eb33b371b blocked users works for multi stream, cuke passes
fixed scoping stuff
2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9 wip 2011-11-03 12:31:24 -07:00
danielgrippi
68a8c23d80 fix all but one cuke 2011-10-27 22:41:49 -07:00
Pistos
0a1e649b2b Convert some reshare-related Cucumber features into specs. Introduce SpecDoc. 2011-10-27 23:27:14 -04:00
danielgrippi
9fba69cd5b added person stream; temp hack for photos 2011-10-25 16:29:45 -07:00
danielgrippi
e63e8299b9 fixed up stream/publisher logic; fixed cukes 2011-10-24 14:41:15 -07:00
Ilya Zhitomirskiy
c6a17cc00b updated cucumber steps 2011-10-24 14:11:34 -07:00
danielgrippi
18690f2b44 all cukes green; spelling error, whoops 2011-10-23 19:07:32 -07:00
danielgrippi
93c70f0649 one cuke failing in changes_password.feature 2011-10-23 19:05:31 -07:00
danielgrippi
44c9fcf65f log in to the stream 2011-10-23 18:21:07 -07:00
Gonzalo Rodriguez
68b33742a4 Add two cuke scenarios to notifications.feature:
* Someone comments on your post
* Someone mentioned you in a post
2011-10-23 18:19:54 -02:00
Gonzalo Rodriguez
63f0dac922 Don't allow to reshare someone else's rehare of your post. Fixes #2214. 2011-10-23 05:06:09 -02:00
Gonzalo Rodriguez
11a59b933f Add cukes scenarios: playing with the aspects-dropdown and posting. 2011-10-23 03:46:08 -02:00
Maxwell Salzberg
484f46d70f add validation which prevent user for signing up with dead username. fix cucumber features 2011-10-20 16:32:09 -07:00
danielgrippi
b46200224e cukes are green again 2011-10-17 17:45:45 -07:00
danielgrippi
4896d056c7 move public option into aspect dropdown in publisher 2011-10-17 15:04:35 -07:00
Maxwell Salzberg
61ae843193 be super pedandic for travis in cukes 2011-10-16 23:19:08 -07:00
Manuel Schölling
bdeae54c6c Make Photos not inherit from Posts 2011-10-16 13:58:35 +02:00
Maxwell Salzberg
d6e9809be1 MS SM finished tag stream refactor 2011-10-15 20:40:20 -07:00
Maxwell Salzberg
8029cb0784 SM MS basic api wip. able to get a users public profile 2011-10-15 18:57:13 -07:00
Jonne Hass
517e37b56a fix another missing translation and a cucumber feature 2011-10-15 12:59:50 +02:00
Daniel Grippi
cfe1506847 Merge pull request #2162 from Pistos/cucumber-postgresql-non-root
Allow Cucumber tests to run with PostgreSQL with a non-root user.
2011-10-12 19:15:01 -07:00
Gonzalo Rodriguez
6849c3604b Keep searched tag in the search field. Closes #1983. 2011-10-12 04:10:26 -02:00
danielgrippi
94e6120714 fixed all cukes except features/closes_account_feature:21 2011-10-11 18:01:39 -07:00
Manuel Schölling
3561021a90 Added cucumber tests for oEmbed feature 2011-10-11 16:09:16 -07:00
Pistos
b6288f841b Allow Cucumber tests to run with PostgreSQL with a non-root user. 2011-10-11 16:54:03 -04:00
Gonzalo Rodriguez
6b5928ca09 Remember last selected aspects through the session 2011-10-09 02:24:53 -02:00
Gonzalo Rodriguez
c8bc7349ad Fix notifications cuke 2011-10-09 01:48:59 -02:00
Gonzalo Rodriguez
c0ea7054d6 Add cuke that tests #2102. Change aspects in the middle of posting. 2011-10-08 18:51:42 -02:00
Gonzalo Rodriguez
6cd9c9c2d0 Refactor syntax on some cukes 2011-10-08 18:33:56 -02:00
Gonzalo Rodriguez
7d6129b7f3 Clarify cucumber step definition 2011-10-08 18:31:04 -02:00
Gonzalo Rodriguez
5b0cae2bbd Fix stops_following_users cuke 2011-10-08 01:42:11 -02:00
Gonzalo Rodriguez
11d607d2b7 Fix manage_aspects cuke 2011-10-06 01:25:30 -02:00
Maxwell Salzberg
9a4c478a7b these spes are really green. too bad we need #moar 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
0f073387ac IZ MS refactor commenting disabled 2011-10-03 15:20:43 -07:00
Gonzalo Rodriguez
738ccf0073 Adapt cuke to new aspect nav implementation 2011-10-02 21:49:31 -02:00
Gonzalo Rodriguez
0b97a3525a Merge branch 'aspect_nav_rework' 2011-10-02 21:08:12 -02:00
Howard Lin
1ffb706946 User email lookup is now case insensitive 2011-10-01 19:50:39 -07:00
Dan Hansen
d0fe59af69 add cucumber feature for photo lightbox
change step to reflect element visibility
2011-10-01 15:52:48 -05:00
Maxwell Salzberg
f5f78a977c attempt fix for reshare cuke 2011-10-01 09:51:41 -07:00
Maxwell Salzberg
c993ff2759 attempt to fix inf scroll cuke 2011-10-01 09:34:50 -07:00
Gonzalo Rodriguez
dee0c06896 Adapt some cukes for the new aspect nav refactor 2011-10-01 04:49:05 -03:00
Gonzalo Rodriguez
d3a5bc1fb8 Merge branch 'master' into aspect_nav_rework 2011-10-01 03:58:50 -03:00
Gonzalo Rodriguez
be2ec46322 Fix comments cuke 2011-10-01 03:13:36 -03:00
Maxwell Salzberg
621075d4e1 fix mentioning from profile page spec, add some tests for the ajax_stream? method 2011-09-30 10:54:13 -07:00
Maxwell Salzberg
cd2eb4292e fix cuke for inf scroll(dont rely on session for sort order) 2011-09-29 17:23:53 -07:00
Maxwell Salzberg
6bda512c02 fixing cukes; does cucumber clear the session every time now? 2011-09-29 17:17:34 -07:00
Gonzalo Rodriguez
5a5bc852e2 Adapt some cukes to the new implementation 2011-09-28 22:34:19 -03:00
Gonzalo Rodriguez
74d00d7db4 Merge branch 'master' into aspect_nav_rework 2011-09-28 19:52:15 -03:00
Gonzalo Rodriguez
dc0c23da2f Slight enhacements on aspect-navigation widget 2011-09-27 03:09:48 -03:00
danielgrippi
49bee9bf19 fix the build 2011-09-26 20:53:06 -07:00
Gonzalo Rodriguez
e0ffd7c63e Merge branch 'master' into aspect_nav_rework
Conflicts:
	features/posts_from_main_page.feature
	public/javascripts/aspect-filters.js
	spec/javascripts/aspect-filters-spec.js
2011-09-27 00:08:05 -03:00
danielgrippi
131166841a added logged out page referencing mobile 2011-09-25 11:58:44 -07:00
Ilya Zhitomirskiy
a009c37d6f fixed the cukes and the tag following 2011-09-23 18:58:19 -07:00
Ilya Zhitomirskiy
ed4b91249d added a publisher to the tag page 2011-09-19 11:38:55 -07:00
danielgrippi
ba8e50e34c DG MS; renamed a file; fixed the build 2011-09-15 15:16:34 -07:00
danielgrippi
166d83d76d remove embedder feature 2011-09-14 12:31:37 -07:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Max Gonzih
6672436bfc add cucumber scenario that expose bug #1924 2011-09-12 14:57:47 +03:00
Sarah Mei
91756663a7 In my irritation, I didn't actually try my renamed aspect. The name I picked was too long. >.< 2011-09-11 15:22:31 -07:00
Sarah Mei
e1f80acdcf Fix occassional postgres failure.
So the cucumber step 'And I follow "link title"' does substring matching, and will click on the first link it finds that contains "link title". Thus if you have 2 aspects, one called PostingTo and the other called NotPostingTo, doing 'And I follow "PostingTo"' may click a different link depending on what order the aspect links are in.
ka-sigh.
2011-09-11 15:14:56 -07:00
Gonzalo Rodriguez
04786bc43e Improvements on aspect navigation rework 2011-09-08 02:13:15 -03:00
Jonne Hass
292b1e7465 small cleanup 2011-09-06 20:13:56 +02:00
Sarah Mei
d0f6fe441f Try a different method of toggling aspects within cucumber features. 2011-09-06 06:35:08 -07: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
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
Sarah Mei
cac4b1ba4e Ridiculously long cucumber timeout so we're more resiliant to travis traffic 2011-09-05 12:08:29 -07: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
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
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
ad009a71dc Don't run oauth.feature on travis, but run all features locally. 2011-09-04 11:27:30 -07:00
Sarah Mei
f23658f9a2 Up the default wait time so travis is happier. 2011-09-03 19:57:03 -07:00
Sarah Mei
6642ee2047 Fix cucumber feature to reflect new aspect dropdown wording 2011-09-03 19:24:19 -07:00
Maxwell Salzberg
d395a29efb add mobile feature, thanks @vcuculo 2011-09-01 14:58:55 -07:00
The Lambda Calculus
9d7b8d7f5d Have passing Cucumber tests [Finishes issue #1126] 2011-09-01 01:59:51 -04:00
The Lambda Calculus
636f05bd32 [Issue 1126] Starting to build cucumber test for issue 2011-09-01 01:59:51 -04:00
Maxwell Salzberg
27864660f9 add feature for mentions 2011-08-30 23:18:08 -07:00
Dan Hansen
624e7277e8 the "When I open the comment box" step used an old javascript function of ours that no longer exists. remove the feature and replace it with "When I focus the comment field" 2011-08-30 22:08:54 -05:00
danielgrippi
bd77560636 cucumber green in postgres (i think?). touched up aspect spec. 2011-08-29 15:53:47 -07:00
Maxwell Salzberg
f479a9a144 Merge branch 'brianwisti-1305-full-markdown' 2011-08-29 10:56:48 -07:00
Gonzalo Rodriguez
068d3c690d Add test scenario: deleting an aspect from homepage 2011-08-28 22:32:05 -03:00
danielgrippi
3a27d66ee8 fix hover to add hover class to element (ugly); fixes one cucumber test 2011-08-27 23:20:57 -07:00
Sarah Mei
60c8a0d00b Use different mouse events to fix tag unfollow icon hovering 2011-08-27 21:54:05 -07:00
Gonzalo Rodriguez
b048d1dd54 When deleting an aspect from contacts page do not redirect to aspects page 2011-08-27 19:24:21 -03:00
Maxwell Salzberg
c66b7d584d Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown
Conflicts:
	Gemfile.lock
2011-08-27 14:13:15 -07:00
Andrej Kacian
5d2d883dd3 Require confirmation when deleting a comment 2011-08-26 20:24:04 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8c9a585337 reshares now have notifications, slight refactor of the notification helper 2011-08-25 17:16:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e45278a043 notification for reshares WIP 2011-08-25 17:16:09 -07:00
Raphael Sofaer
dec10e3de9 Finish setting up sesssions#new prefill when logged out by authorizationsControlelr 2011-08-23 16:37:51 -07:00
Raphael Sofaer
89edfb7ed6 WIP prefilling username on logout of user is almost there 2011-08-23 16:37:50 -07:00
Raphael Sofaer
a63d1ad4ae Sign out the signed in user if a different uid is passed to AuthorizationsController#new 2011-08-23 16:37:50 -07:00
Raphael Sofaer
c95f80be42 Re-nullify chubbies output and correctly handle diaspora_id param in create_account 2011-08-23 16:37:50 -07:00
Raphael Sofaer
76b0f31020 Fix the chubbies icon_url field, that needs to be icon path or be a url 2011-08-23 16:37:50 -07:00
danielgrippi
a7d9bbed84 wip 2011-08-23 16:37:50 -07:00
danielgrippi
27049e52b5 connect logic 2011-08-23 16:37:50 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7a5fc11505 initial cucumber step 2011-08-23 16:37:50 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7fd7fa968c fixed the email from header issues and backfilled few tests 2011-08-22 17:38:40 -07:00
Dan Hansen
4a64a172d1 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged
Conflicts:
	spec/javascripts/stream-spec.js
2011-08-21 20:57:01 -05:00
Gonzalo Rodriguez
e5391c1d21 Test reply to conversations 2011-08-20 18:59:09 -03:00
Dan Hansen
3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
2011-08-20 14:40:56 -05:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962 Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'""
This reverts commit a407f12463.
2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463 Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
2011-08-18 16:16:14 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b1e95def4a Merge branch 'master' into issue1586-aspectdropdown-when-posting 2011-08-18 12:59:00 -07:00
Raphael Sofaer
c7331230bc Revert "Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of ="
This reverts commit b11bd23da2.
2011-08-18 12:06:04 -07:00
danielgrippi
b11bd23da2 Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of =
This reverts commit 7969b52035.
2011-08-18 11:20:49 -07:00
danielgrippi
7969b52035 Revert "remove uploaded test images after running the specs/cucumber"
This reverts commit a6eb275c7a.
2011-08-18 11:11:08 -07:00
danielgrippi
a6eb275c7a remove uploaded test images after running the specs/cucumber 2011-08-18 11:08:57 -07:00
Gonzalo Rodriguez
2d54d9a97e Validate presence of message text on conversations. Closes #1329. 2011-08-17 23:52:31 -03:00
danielgrippi
eb8c540ac1 MS DG IZ major invite refactor. all tests are green minus weird stuff on dans computer, need to checkout this out on pivots 2011-08-17 16:28:21 -07:00
Brian Wisti
03127cd592 basic support for Redcarpet Markdown 2011-08-16 21:48:48 -07:00
Raphael Sofaer
cc3eeac98e Merge the aspect dropdown in the publisher with master, some things are still broken 2011-08-16 14:59:53 -07:00
Raphael Sofaer
1bd7e1314f Make the signs up feature more robust 2011-08-16 11:34:34 -07:00
Andrej Kacian
48282e3402 Make and use a single cucumber step to send a private message 2011-08-13 05:03:27 +02:00
Andrej Kacian
9c99331bb7 Improve the conversation test a bit 2011-08-13 04:36:26 +02:00
Andrej Kacian
fe93fd5c91 Write a cucumber test for starting a private conversation 2011-08-13 03:57:41 +02:00
Raphael Sofaer
56fc409a39 Most of the way towards getting posts feature working 2011-08-11 18:15:18 -07:00
Dan Hansen
2e9040e227 merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less 2011-08-10 23:57:33 -07:00
Andrej Kacian
2f924e2e8a Make sure we got the right tag, just in case there will be more in the test background later. 2011-08-10 21:50:30 +02:00
Andrej Kacian
05fb2c3e7a Write cucumber test for unfollowing a tag directly from tag listing 2011-08-09 22:54:31 +02:00
Sarah Mei
6c512cbfa9 Chubbies is now a little TOO good at shutting itself off. Also: processes are hard. >.< 2011-08-06 19:22:09 -07:00
Sarah Mei
1ccfaedd08 Chubbies actually shuts itself down now, so both builds should now be able to be green at the same time. FWIW, @ variables in class methods are class variables and therefore persist across tests. 2011-08-06 18:19:17 -07:00
Raphael Sofaer
e366a4b8b5 re-enable the embedder feature outside of CI 2011-08-05 17:03:21 -07:00
danielgrippi
75c3107035 made signing up and accepting an invitation look a little nicer 2011-08-05 12:36:53 -07:00
Raphael Sofaer
d33282cbf6 Make cucumber think that facebook has been configured 2011-08-05 11:52:35 -07:00
Daniel Grippi
f63ba2c557 Merge pull request #1707 from TheLambdaCalculus/b1696-publisher-should-automatically-collapse-if-last-photo-removed-and-otherwise-blank
Issue #1696 - When the last photo is deleted from the publisher, we now collapse the publisher if no status text had been entered.
2011-08-05 10:57:33 -07:00
danielgrippi
99ac976594 fix redirects around getting_started and aspect/index 2011-08-03 18:07:43 -07:00
danielgrippi
987d334764 fixed tests, translations, initalizer 2011-08-03 18:02:58 -07:00
danielgrippi
e23439d193 fix cucumber; temporarily remove fetch featured users initilizer 2011-08-03 18:02:57 -07:00
danielgrippi
66315eca18 capitalize reshare when there are no reshares 2011-08-02 10:40:36 -07:00
Raphael Sofaer
603cc5d2c7 lowercese r on reshare 2011-08-02 10:17:49 -07:00
Raphael Sofaer
5d27b8047e Take the :first restriction off of posts.feature 2011-08-01 16:26:21 -07:00
danielgrippi
756a20ecd4 link a user to featured users if user has zero contacts 2011-08-01 15:19:51 -07:00
Gaelan D'costa
ba98043412 Issue #1126 - When the last photo is deleted from the publisher, we now collapse the publisher if no status text had been entered. 2011-07-31 19:29:01 -04:00
Sarah Mei
92a0b568c3 Refactor notifications.feature - we were testing the same thing with two different scenarios. 2011-07-31 14:28:21 -07:00
Sarah Mei
7f81892245 For some reason, firefox doesn't like the outerHTML property of this div - it's always undefined. This was manifesting itself as ajax requests never completing in the cucumber feature due to a js error. 2011-07-31 13:32:05 -07:00
Sarah Mei
f0ecef7f1a Make connects_users.feature slightly less flaky 2011-07-31 12:40:36 -07:00
Sarah Mei
790c74d1a6 Make accepts_invitation.feature less flaky. 2011-07-30 22:51:06 -07:00
Sarah Mei
b7b1c6b276 Fix interaction between I18n fallbacks and our interpolation fallback code. Refactor I18n tests into their own file. Remove some test support code that made it hard to test I18n. 2011-07-30 22:41:46 -07:00
Raphael Sofaer
1e7f9fa43c Get rid of duplicate step definition. 2011-07-29 17:59:25 -07:00
Raphael Sofaer
0873ad5828 Test and fix contacts index page 2011-07-29 17:01:45 -07:00
danielgrippi
dfa5824dc1 remove repeated link, fixed cucumber 2011-07-28 14:52:09 -07:00
Dan Hansen
e8bde11a92 fix failing features 2011-07-26 21:55:52 -07:00
Raphael Sofaer
17774d8b3b Getting repost back to almost green. 2011-07-21 19:15:47 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
bd1c8efe54 wip integration servers 2011-07-21 18:23:33 -07:00
danielgrippi
2d6f51f68c repost wip 2011-07-21 18:22:18 -07:00
danielgrippi
bdc4b9f746 marsharing reshares now grabs the post from the original poster, also fetcheer that person if they don't exist locally still need to ping for xml and give the right xml back 2011-07-21 18:22:18 -07:00
danielgrippi
f3a515eef1 DG IZ reshare retractions is WIP 2011-07-21 18:22:17 -07:00
danielgrippi
d1bbbdbc4c fixed all specs; rebased. 2011-07-21 18:22:17 -07:00
Ilya Zhitomirskiy
ce94779766 not showing the reshare button to the users on things they can't reshare 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
fa9269541f wip removed some generated specs 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
06f886ad77 WIP reshare 2011-07-21 18:22:17 -07:00
Raphael Sofaer
e5c8ebf6e2 Add cucumber feature for changing email address 2011-07-19 11:43:24 -07:00
Sarah Mei
088e2dfdb4 Maybe...we're not waiting long enough on CI? It is a very slow box. 2011-07-14 19:09:14 -07:00
Sarah Mei
6974b205a1 CI's cucumber output is once again a blessed field of dots. 2011-07-14 18:44:59 -07:00
Sarah Mei
7bfd695483 Patch Capybara to get rid of cucumber deprecation warnings 2011-07-14 17:55:03 -07:00
Sarah Mei
a096f3d9fc Make infinite scroll feature work on any size screen. 2011-07-14 17:31:31 -07:00
Maxwell Salzberg
07ca376854 fix failing cuke 2011-07-12 20:19:39 -07:00
Raphael Sofaer
39ff51a9d7 Make comments index ajaxy 2011-07-11 14:03:59 -07:00
Raphael Sofaer
97ca10ddda Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
Raphael Sofaer
46ef376bc1 Fix notifications feature 2011-07-06 19:00:29 -07:00
Raphael Sofaer
19911bc856 Fix cucumber on my computer 2011-07-05 19:23:58 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
06abdce180 Use explicit classes in the hover step definition 2011-07-05 15:33:34 -07:00