Merge stable into master

package.json

@@ -158,7 +158,7 @@
     "unexpected-react": "^3.1.1",
     "unexpected-sinon": "^10.4.0",
     "url-loader": "^0.5.7",
-    "webpack": "^2.1.0-beta.1",
+    "webpack": "^2.1.0-beta.24",
     "webpack-dev-middleware": "^1.6.1",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-koa-hot-middleware": "^0.1.2",

src/components/follow-button.js

@@ -16,7 +16,6 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 import React, { PropTypes } from 'react';
-import { find } from 'lodash';
 
 import {
   ArrayOfUsersId as ArrayOfUsersIdPropType,
@@ -62,8 +61,7 @@ export default class FollowButton extends React.Component {
       return null;  // do not allow to follow one's self
     }
 
-    const is_followed = find(following, user.id);
-    if (is_followed) {
+    if (following.includes(user.id)) {
       return <button className="button button-wide button-yellow" onClick={this.unfollowUser}>Following</button>;
     }
 

src/components/register.js

@@ -289,8 +289,8 @@ export class Register extends React.Component {
             {fields.agree.error &&
               <Message message={fields.agree.error} />
             }
-            <div className="layout__grid layout__grid-big layout-align_vertical">
-              <button className="button button-big button-green">Sign up</button>
+            {/* TODO: Get rid of layout__grid. This is a temporary solution. */}
+            <div className="layout__grid layout__grid-big layout__grid-responsive layout__grid-row_reverse layout-align_vertical layout-align_right">
               <label className="action checkbox">
                 <input
                   id="registerAgree"
@@ -301,6 +301,7 @@ export class Register extends React.Component {
                 />
                 <span className="checkbox__label-right">I agree to Terms &amp; Conditions</span>
               </label>
+              <button className="button button-big button-green">Sign up</button>
             </div>
           </div>
         </form>

test-helpers/factories/user.js

@@ -6,8 +6,11 @@ const faker = require('faker');
 
 export default new Factory()
   .attr('id', () => uuid.v4())
+  .attr('created_at', () => faker.date.recent())
+  .attr('updated_at', () => faker.date.recent())
   .attr('username', () => faker.internet.userName().toLowerCase())
   .attr('email', () => faker.internet.email())
   .attr('password', () => faker.internet.password())
   .attr('hashed_password', ['password'], password => bcrypt.hashSync(password, 10))
-  .attr('email_check_hash', '');
+  .attr('email_check_hash', '')
+  .attr('more', { first_login: false });

test/unit/components/follow-button.js

@@ -1,15 +1,57 @@
 /*eslint-env node, mocha */
 import { shallow } from 'enzyme';
+import { v4 as uuid4 } from 'uuid';
 
-import { TestUtils, unexpected, expect, React } from '../../../test-helpers/expect-unit';
+import { expect, React } from '../../../test-helpers/expect-unit';
 import FollowButton from '../../../src/components/follow-button';
+import userFactory from '../../../test-helpers/factories/user';
 
 
-describe('Follow button Test', function() {
+describe('Follow button Test', function () {
+  const currentUser = userFactory.build();
+  currentUser.favourites = [];
+  currentUser.geotags = [];
+  currentUser.hashtags = [];
+  currentUser.schools = [];
+  currentUser.suggested_users = [];
+  currentUser.followed_geotags = [];
+  currentUser.followed_hashtags = [];
+  currentUser.followed_schools = [];
+  currentUser.liked_geotags = [];
+  currentUser.liked_hashtags = [];
+  currentUser.liked_schools = [];
+  currentUser.likes = [];
+  currentUser.recent_tags = {
+    geotags: [],
+    hashtags: [],
+    schools: []
+  };
 
-  it('is empty for anonym user or when no current_user in props', function() {
+  it('is empty for anonym user or when no current_user in props', function () {
     const wrapper = shallow(<FollowButton />);
 
     return expect(wrapper.equals(null), 'to be true');
   });
+
+  it('should render "Follow" for unfollowed users', () => {
+    const props = {
+      active_user: currentUser,
+      following: [uuid4(), uuid4()],
+      user: userFactory.build()
+    };
+    const wrapper = shallow(<FollowButton {...props} />);
+    return expect(wrapper.text(), 'to be', 'Follow');
+  });
+
+  it('should render "Following" for followed users', () => {
+    const user = userFactory.build();
+
+    const props = {
+      active_user: currentUser,
+      following: [uuid4(), uuid4(), user.id],
+      user
+    };
+    const wrapper = shallow(<FollowButton {...props} />);
+    return expect(wrapper.text(), 'to be', 'Following');
+  });
 });

webpack.dev.config.js

@@ -13,7 +13,7 @@ module.exports = {
   ],
 
   resolve: {
-    extensions: ['', '.js', '.jsx', '.less']
+    extensions: ['.js', '.jsx', '.less']
   },
 
   output: {
@@ -24,15 +24,14 @@ module.exports = {
   },
 
   module: {
-    postLoaders: [
+    rules: [
       // Fix grapheme-breaker
       {
+        enforce: 'post',
         test: /\.js$/,
         include: /node_modules\/grapheme-breaker/,
         loader: 'transform/cacheable?brfs'
-      }
-    ],
-    loaders: [
+      },
       {
         test: /\.jsx?$/,
         exclude: /node_modules/,
@@ -69,13 +68,17 @@ module.exports = {
     new webpack.NoErrorsPlugin(),
     new webpack.DefinePlugin({
       __DEV__: true
+    }),
+    new webpack.LoaderOptionsPlugin({
+      debug: true,
+      options: {
+        context: __dirname,
+        postcss: [
+          autoprefixer
+        ]
+      }
     })
   ],
 
-  postcss: () => {
-    return [autoprefixer];
-  },
-
-  debug: true,
   devtool: 'cheap-module-inline-source-map'
 };

webpack.prod.config.js

@@ -11,7 +11,7 @@ module.exports = {
   ],
 
   resolve: {
-    extensions: ['', '.js', '.jsx', '.less']
+    extensions: ['.js', '.jsx', '.less']
   },
 
   output: {
@@ -21,15 +21,14 @@ module.exports = {
   },
 
   module: {
-    postLoaders: [
+    rules: [
       // Fix grapheme-breaker
       {
+        enforce: 'post',
         test: /\.js$/,
         include: /node_modules\/grapheme-breaker/,
         loader: 'transform/cacheable?brfs'
-      }
-    ],
-    loaders: [
+      },
       {
         test: /\.jsx?$/,
         exclude: /node_modules/,
@@ -62,10 +61,14 @@ module.exports = {
     new ExtractTextPlugin({
       filename: 'styles.css',
       allChunks: true
+    }),
+    new webpack.LoaderOptionsPlugin({
+      options: {
+        context: __dirname,
+        postcss: [
+          autoprefixer
+        ]
+      }
     })
-  ],
-
-  postcss: () => {
-    return [autoprefixer];
-  }
+  ]
 };