Skip to content

Commit

Permalink
Merge pull request #437 from Midburn/fix-sync
Browse files Browse the repository at this point in the history
Fix sync
  • Loading branch information
LeonFedotov authored May 21, 2017
2 parents 6f19d64 + 666f89a commit 7c0d617
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"this is part of the deployment proess, so it is important to update the version number",
"version name corresponds to the github release name / tag name - https://github.com/Midburn/Spark/releases"
],
"version": "2.5.9",
"version": "2.6.0",
"private": true,
"scripts": {
"postinstall": "bower install",
Expand Down
2 changes: 1 addition & 1 deletion tests/routes/admin_routes.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var knex = require('../../libs/db').knex;
var constants = require('../../models/constants');
var _ = require('lodash');

const ADMIN_USER_EMAIL = "omerpines@hotmail.com";
const ADMIN_USER_EMAIL = "omerp@websplanet.com";
const ADMIN_USER_PASSWORD = "123456";
const ADMIN_USER_FIRST_NAME = "Omer Hatotach";

Expand Down
2 changes: 1 addition & 1 deletion tests/routes/api_routes.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('API routes', function() {
return request
.post('/api/userlogin')
.send({
username: "omerpines@hotmail.com",
username: "omerp@websplanet.com",
password: "123456",
token: TEST_TOKEN
})
Expand Down
2 changes: 1 addition & 1 deletion tests/routes/main_routes.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('Main routes', function() {
});

it('logs-in a drupal user', function loginDrupalUser(done) {
var email = 'omerpines@hotmail.com';
var email = 'omerp@websplanet.com';
// var hashed_password = '$S$DX1KmzFZtwY3VOgioPlO8vqXELOs4VisHPzMQ5mP6sYI.MJpHpXs';
var clear_password = '123456';
Promise.all([
Expand Down

0 comments on commit 7c0d617

Please sign in to comment.