conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
=======
discoveringChildren: false,
children: null,
rssi: null,
scanResponse: false,
>>>>>>>
rssi: null,
scanResponse: false, |
<<<<<<<
// window.Store.sync is deprectated, use Backbone.LocalStorage.sync instead
Backbone.LocalStorage.sync = window.Store.sync = Backbone.sync = function(method, model, options, error) {
=======
Backbone.localSync = function(method, model, options, error) {
>>>>>>>
// window.Store.sync is deprectated, use Backbone.LocalStorage.sync instead
Backbone.LocalStorage.sync = window.Store.sync = Backbone.localSync = function(method, model, options, error) {
<<<<<<<
};
})();
=======
};
// Override 'Backbone.sync' to default to localSync,
// the original 'Backbone.sync' is still available in 'Backbone.ajaxSync'
Backbone.ajaxSync = Backbone.sync;
Backbone.sync = Backbone.localSync;
>>>>>>>
};
// Override 'Backbone.sync' to default to localSync,
// the original 'Backbone.sync' is still available in 'Backbone.ajaxSync'
Backbone.ajaxSync = Backbone.sync;
Backbone.sync = Backbone.LocalStorage.sync; |
<<<<<<<
this.localStorage().setItem(this.name+"-"+model.id, JSON.stringify(model));
var modelId = model.id.toString();
if (!contains(this.records, modelId)) {
this.records.push(modelId);
this.save();
}
=======
this.localStorage().setItem(this.name+"-"+model.id, this.serializer.serialize(model));
if (!_.include(this.records, model.id.toString()))
this.records.push(model.id.toString()); this.save();
>>>>>>>
this.localStorage().setItem(this.name+"-"+model.id, this.serializer.serialize(model));
var modelId = model.id.toString();
if (!contains(this.records, modelId)) {
this.records.push(modelId);
this.save();
}
<<<<<<<
var result = [];
for (var i = 0, id, data; i < this.records.length; i++) {
id = this.records[i];
data = this.jsonData(this.localStorage().getItem(this.name+"-"+id));
if (data != null) result.push(data);
}
return result;
=======
// Lodash removed _#chain in v1.0.0-rc.1
return (_.chain || _)(this.records)
.map(function(id){
return this.serializer.deserialize(this.localStorage().getItem(this.name+"-"+id));
}, this)
.compact()
.value();
>>>>>>>
var result = [];
for (var i = 0, id, data; i < this.records.length; i++) {
id = this.records[i];
data = this.serializer.deserialize(this.localStorage().getItem(this.name+"-"+id));
data = this.jsonData(this.localStorage().getItem(this.name+"-"+id));
if (data != null) result.push(data);
}
return result;
<<<<<<<
var resp, errorMessage;
//If $ is having Deferred - use it.
var syncDfd = Backbone.$ ?
(Backbone.$.Deferred && Backbone.$.Deferred()) :
(Backbone.Deferred && Backbone.Deferred());
=======
var resp, errorMessage,
// If $ and $ is having Deferred - use it.
syncDfd = Backbone.$ && Backbone.$.Deferred && Backbone.$.Deferred();
>>>>>>>
var resp, errorMessage;
//If $ is having Deferred - use it.
var syncDfd = Backbone.$ ?
(Backbone.$.Deferred && Backbone.$.Deferred()) :
(Backbone.Deferred && Backbone.Deferred()); |
<<<<<<<
request.session._store = {};
cache.get(request.session.id, function (err, cached) {
=======
return cache.get(request.session.id, function (err, cached) {
>>>>>>>
request.session._store = {};
return cache.get(request.session.id, function (err, cached) { |
<<<<<<<
cookieOptions: {
=======
options: {
>>>>>>>
cookieOptions: {
<<<<<<<
server.plugin().allow({ ext: true }).require('../', options, function (err) {
=======
>>>>>>>
<<<<<<<
path: '/set1',
config: {
handler: function (request) {
=======
path: '/set',
config: {
handler: function (request) {
>>>>>>>
path: '/set',
config: {
handler: function (request) {
<<<<<<<
path: '/set2',
config: {
handler: function (request) {
=======
path: '/clear',
config: {
handler: function (request) {
>>>>>>>
path: '/clear',
config: {
handler: function (request) {
<<<<<<<
console.log('server started on port: ', server.settings.port);
=======
console.log('server started on port', port);
>>>>>>>
console.log('server started on port: ', server.settings.port); |
<<<<<<<
grunt.loadTasks(join(__dirname, '../node_modules/grunt-mocha/tasks'));
grunt.loadTasks(join(__dirname, '../node_modules/grunt-shell/tasks'));
=======
>>>>>>>
grunt.loadTasks(join(__dirname, '../node_modules/grunt-mocha/tasks')); |
<<<<<<<
this.destroyerCubeLocation = this.options.destroyerCube;
this.board = this.board || _forceSlice(this.options.smallCube);
=======
this.board = this.options.board;
this.destroyerCubeLocation = this.options.destroyer;
this.currentSmallCubePos = this.options.smallCube;
>>>>>>>
this.board = this.board || _forceSlice(this.options.smallCube);
this.destroyerCubeLocation = this.options.destroyer;
<<<<<<<
[0, 0, 0 ],
[1, 0, 0 ],
[2, 0, 0 ],
[3, 0, 0 ],
[0, 1, 0 ],
[1, 1, 0 ],
[2, 1, 0 ],
[3, 1, 0 ],
[0, 2, 0 ],
[1, 2, 0 ],
[2, 2, 0 ],
[3, 2, 0 ],
[0, 3, 0 ],
[1, 3, 0 ],
[2, 3, 0 ],
[3, 3, 0 ]
=======
// normal cubes`
[0, 0, 0 ],
[1, 0, 0 ],
[2, 0, 0 ],
[3, 0, 0 ],
[0, 1, 0 ],
[1, 1, 0 ],
[2, 1, 0 ],
[3, 1, 0 ],
[0, 2, 0 ],
[1, 2, 0 ],
[2, 2, 0 ],
[3, 2, 0 ],
[0, 3, 0 ],
[1, 3, 0 ],
[2, 3, 0 ],
[3, 3, 0 ]
>>>>>>>
[0, 0, 0 ],
[1, 0, 0 ],
[2, 0, 0 ],
[3, 0, 0 ],
[0, 1, 0 ],
[1, 1, 0 ],
[2, 1, 0 ],
[3, 1, 0 ],
[0, 2, 0 ],
[1, 2, 0 ],
[2, 2, 0 ],
[3, 2, 0 ],
[0, 3, 0 ],
[1, 3, 0 ],
[2, 3, 0 ],
[3, 3, 0 ]
<<<<<<<
=======
function _setListeners (){
this.rotatingLogic.pipe(this._eventInput);
}
function _destroyerMovement(){
this._eventInput.on('movingCube', function(data){
console.log('original pos:', this.destroyerCubeLocation);
console.log('nVec pos:', this.rotatingLogic.nVec);
console.log('rVec pos:', this.rotatingLogic.rVec);
var newPos = this.destroyerCubeLocation;
var didUpdate = false;
for (var i =0; i<this.destroyerCubeLocation.length; i++){
var tempUpdate = this.destroyerCubeLocation[i]
+ this.rotatingLogic.rVec[i]*data[0]
+ this.rotatingLogic.nVec[i]*data[1];
if (tempUpdate >= 0 && tempUpdate <= 3){
newPos[i] = tempUpdate;
didUpdate = true;
}
}
if (didUpdate){
this.destroyerCubeLocation = newPos;
_removeSmallCube.call(this, newPos);
this.rotatingLogic.setDestroyerPosition(newPos);
console.log('New Pos:', newPos);
}
}.bind(this));
}
function _removeSmallCube(pos){
console.log('board', this);
for(var i =0; i < this.currentSmallCubePos.length; i++){
if (this.currentSmallCubePos[i][0] === pos[0]
&& this.currentSmallCubePos[i][1] === pos[1]
&& this.currentSmallCubePos[i][2] === pos[2]){
this.currentSmallCubePos.slice(i,1);
console.log('removed cube', pos);
return;
}
}
console.log('no cube removed', pos);
}
>>>>>>>
function _setListeners (){
this.rotatingLogic.pipe(this._eventInput);
}
function _destroyerMovement(){
this._eventInput.on('movingCube', function(data){
console.log('original pos:', this.destroyerCubeLocation);
console.log('nVec pos:', this.rotatingLogic.nVec);
console.log('rVec pos:', this.rotatingLogic.rVec);
var newPos = this.destroyerCubeLocation;
var didUpdate = false;
for (var i =0; i<this.destroyerCubeLocation.length; i++){
var tempUpdate = this.destroyerCubeLocation[i]
+ this.rotatingLogic.rVec[i]*data[0]
+ this.rotatingLogic.nVec[i]*data[1];
if (tempUpdate >= 0 && tempUpdate <= 3){
newPos[i] = tempUpdate;
didUpdate = true;
}
}
if (didUpdate){
this.destroyerCubeLocation = newPos;
_removeSmallCube.call(this, newPos);
this.rotatingLogic.setDestroyerPosition(newPos);
console.log('New Pos:', newPos);
}
}.bind(this));
}
function _removeSmallCube(pos){
console.log('board', this);
for(var i =0; i < this.currentSmallCubePos.length; i++){
if (this.currentSmallCubePos[i][0] === pos[0]
&& this.currentSmallCubePos[i][1] === pos[1]
&& this.currentSmallCubePos[i][2] === pos[2]){
this.currentSmallCubePos.slice(i,1);
console.log('removed cube', pos);
return;
}
}
console.log('no cube removed', pos);
} |
<<<<<<<
mainContext.add(modifier).add(gameLogic);
mainContext.add(modifier).add(levelSelection);
mainContext.add(fpsMeter);
=======
>>>>>>>
mainContext.add(fpsMeter); |
<<<<<<<
module.exports = async ({cwd, env, branch, options: {repositoryUrl}}) => {
=======
module.exports = async ({cwd, env, options: {repositoryUrl, branch}}) => {
const GIT_TOKENS = {
GIT_CREDENTIALS: undefined,
GH_TOKEN: undefined,
// GitHub Actions require the "x-access-token:" prefix for git access
// https://developer.github.com/apps/building-github-apps/authenticating-with-github-apps/#http-based-git-access-by-an-installation
GITHUB_TOKEN: isNil(env.GITHUB_ACTION) ? undefined : 'x-access-token:',
GL_TOKEN: 'gitlab-ci-token:',
GITLAB_TOKEN: 'gitlab-ci-token:',
BB_TOKEN: 'x-token-auth:',
BITBUCKET_TOKEN: 'x-token-auth:',
};
>>>>>>>
module.exports = async ({cwd, env, branch, options: {repositoryUrl}}) => {
const GIT_TOKENS = {
GIT_CREDENTIALS: undefined,
GH_TOKEN: undefined,
// GitHub Actions require the "x-access-token:" prefix for git access
// https://developer.github.com/apps/building-github-apps/authenticating-with-github-apps/#http-based-git-access-by-an-installation
GITHUB_TOKEN: isNil(env.GITHUB_ACTION) ? undefined : 'x-access-token:',
GL_TOKEN: 'gitlab-ci-token:',
GITLAB_TOKEN: 'gitlab-ci-token:',
BB_TOKEN: 'x-token-auth:',
BITBUCKET_TOKEN: 'x-token-auth:',
}; |
<<<<<<<
$save_btn.appendTo( $panel );
$share_btn.appendTo( $panel );
=======
$save_btn.disabled( false );
$share_btn.disabled( false );
>>>>>>>
$save_btn.appendTo( $panel );
$share_btn.appendTo( $panel );
$save_btn.disabled( false );
$share_btn.disabled( false );
<<<<<<<
$.ajax( {
cache: false,
url: url,
dataType: 'text',
success: function ( result ) {
watchingChanges = false;
minder.importData( result, 'json' );
if ( !draftManager.openByPath( remotePath ) ) {
draftManager.create();
}
draftManager.save( remotePath );
draftManager.sync();
minder.execCommand( 'camera', minder.getRoot() );
$user_btn.loading( false ).text( getFileName( remotePath ) );
watchingChanges = true;
}
} );
=======
// the url to download the file on cloud dist
var arr = remotePath.split('.');
var format = arr[arr.length - 1];
if(format in loadFile){
loadFile[ format ]( url );
}
>>>>>>>
// the url to download the file on cloud dist
var arr = remotePath.split( '.' );
var format = arr[ arr.length - 1 ];
if ( format in loadFile ) {
loadFile[ format ]( url );
} |
<<<<<<<
import React, { useState, createContext } from 'react';
import NavBar from './containers/NavBar';
import LeftPanel from './containers/LeftPanel';
import ProjectLoader from './containers/ProjectLoader';
import RightPanel from './containers/RightPanel';
import FileTree from './FileTree';
import { library } from "@fortawesome/fontawesome-svg-core";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
faPlus,
faMinus,
faTimes,
faQuestionCircle
} from "@fortawesome/free-solid-svg-icons";
export const UrlContext = createContext(null)
export const FileTreeContext = createContext(null);
export const FileCodeContext = createContext(null);
export const LoadedContext = createContext(null);
export const ToggleContext = createContext(null);
library.add(faPlus, faMinus, faTimes, faQuestionCircle);
const styles = {
fontFamily: "arial",
display: "flex",
};
const loaderDiv = {
display:"flex",
justifyContent: "center"
}
const App = () => {
const [url, setUrl] = useState('');
const [fileCode, setFileCode] = useState('');
const [fileTree, setFileTree] = useState(null);
const [loaded, setLoaded] = useState(false);
const [toggleView, setToggleView] = useState(false);
if(!loaded) {
return (
<div style={loaderDiv}>
<FileTreeContext.Provider value={setFileTree}>
<LoadedContext.Provider value={setLoaded}>
<UrlContext.Provider value={setUrl}>
<ProjectLoader />
</UrlContext.Provider>
</LoadedContext.Provider>
</FileTreeContext.Provider>
</div>
)}
else {
return (
<div style={styles}>
<FileCodeContext.Provider value={setFileCode}>
<FileTreeContext.Provider value={fileTree}>
<ToggleContext.Provider value={setToggleView}>
<NavBar />
</ToggleContext.Provider>
</FileTreeContext.Provider>
</FileCodeContext.Provider>
<LeftPanel />
<FileCodeContext.Provider value={fileCode}>
<UrlContext.Provider value={url}>
<ToggleContext.Provider value={toggleView}>
<RightPanel />
</ToggleContext.Provider>
</UrlContext.Provider>
</FileCodeContext.Provider>
</div>
)
}
}
export default App;
=======
import React, { useState, useReducer, createContext } from 'react';
import NavBar from './containers/NavBar';
import LeftPanel from './containers/LeftPanel';
import ProjectLoader from './containers/ProjectLoader';
import RightPanel from './containers/RightPanel';
import { TestCaseContext, testCaseState, testCaseReducer } from "./context/testCaseReducer";
import { MockDataContext, mockDataState, mockDataReducer } from "./context/mockDataReducer";
import { library } from "@fortawesome/fontawesome-svg-core";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
faPlus,
faMinus,
faTimes,
faQuestionCircle
} from "@fortawesome/free-solid-svg-icons";
export const FileTreeContext = createContext(null);
export const FileCodeContext = createContext(null);
export const LoadedContext = createContext(null);
library.add(faPlus, faMinus, faTimes, faQuestionCircle);
const styles = {
fontFamily: "arial",
display: "flex",
};
const loaderDiv = {
display:"flex",
justifyContent: "center"
}
const App = () => {
const [fileCode, setFileCode] = useState('');
const [fileTree, setFileTree] = useState(null);
const [loaded, setLoaded] = useState(false);
const [testCase, dispatchTestCase] = useReducer(
testCaseReducer,
testCaseState
);
console.log(testCase);
const [mockData, dispatchMockData] = useReducer(
mockDataReducer,
mockDataState
);
if(!loaded) {
return (
<div style={loaderDiv}>
<>
<FileTreeContext.Provider value={setFileTree}>
<LoadedContext.Provider value={setLoaded}>
<ProjectLoader />
</LoadedContext.Provider>
</FileTreeContext.Provider>
</>
</div>
)}
else {
return (
<div style={styles}>
<>
<FileCodeContext.Provider value={setFileCode}>
<FileTreeContext.Provider value={fileTree}>
<TestCaseContext.Provider value={testCase}>
<MockDataContext.Provider value={mockData}>
<NavBar />
</MockDataContext.Provider>
</TestCaseContext.Provider>
</FileTreeContext.Provider>
</FileCodeContext.Provider>
<TestCaseContext.Provider value={[testCase, dispatchTestCase]}>
<MockDataContext.Provider value={[mockData, dispatchMockData]}>
<LeftPanel />
</MockDataContext.Provider>
</TestCaseContext.Provider>
<FileCodeContext.Provider value={fileCode}>
<RightPanel />
</FileCodeContext.Provider>
</>
</div>
)
}
}
export default App;
>>>>>>>
import React, { useState, useReducer, createContext } from 'react';
import NavBar from './containers/NavBar';
import LeftPanel from './containers/LeftPanel';
import ProjectLoader from './containers/ProjectLoader';
import RightPanel from './containers/RightPanel';
import FileTree from './FileTree';
import { TestCaseContext, testCaseState, testCaseReducer } from "./context/testCaseReducer";
import { MockDataContext, mockDataState, mockDataReducer } from "./context/mockDataReducer";
import { library } from "@fortawesome/fontawesome-svg-core";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
faPlus,
faMinus,
faTimes,
faQuestionCircle
} from "@fortawesome/free-solid-svg-icons";
export const UrlContext = createContext(null)
export const FileTreeContext = createContext(null);
export const FileCodeContext = createContext(null);
export const LoadedContext = createContext(null);
export const ToggleContext = createContext(null);
library.add(faPlus, faMinus, faTimes, faQuestionCircle);
const styles = {
fontFamily: "arial",
display: "flex",
};
const loaderDiv = {
display:"flex",
justifyContent: "center"
}
const App = () => {
const [fileTree, setFileTree] = useState(null);
const [fileCode, setFileCode] = useState('');
const [url, setUrl] = useState('');
const [loaded, setLoaded] = useState(false);
const [toggleView, setToggleView] = useState(false);
const [testCase, dispatchTestCase] = useReducer(
testCaseReducer,
testCaseState
);
const [mockData, dispatchMockData] = useReducer(
mockDataReducer,
mockDataState
);
if(!loaded) {
return (
<div style={loaderDiv}>
<FileTreeContext.Provider value={setFileTree}>
<LoadedContext.Provider value={setLoaded}>
<UrlContext.Provider value={setUrl}>
<ProjectLoader />
</UrlContext.Provider>
</LoadedContext.Provider>
</FileTreeContext.Provider>
</div>
)}
else {
return (
<div style={styles}>
<FileCodeContext.Provider value={setFileCode}>
<FileTreeContext.Provider value={fileTree}>
<ToggleContext.Provider value={setToggleView}>
<TestCaseContext.Provider value={testCase}>
<MockDataContext.Provider value={mockData}>
<NavBar />
</MockDataContext.Provider>
</TestCaseContext.Provider>
</ToggleContext.Provider>
</FileTreeContext.Provider>
</FileCodeContext.Provider>
<TestCaseContext.Provider value={[testCase, dispatchTestCase]}>
<MockDataContext.Provider value={[mockData, dispatchMockData]}>
<LeftPanel />
</MockDataContext.Provider>
</TestCaseContext.Provider>
<FileCodeContext.Provider value={fileCode}>
<UrlContext.Provider value={url}>
<ToggleContext.Provider value={toggleView}>
<RightPanel />
</ToggleContext.Provider>
</UrlContext.Provider>
</FileCodeContext.Provider>
</div>
)
}
}
export default App; |
<<<<<<<
// hookRender
export const addHookRender = () => ({
type: actionTypes.ADD_HOOKRENDER,
});
export const deleteHookRender = id => ({
type: actionTypes.DELETE_HOOKRENDER,
id,
});
export const updateHookRender = ({
id,
hookRenderFolder,
hookFuncFolder,
hookFunction,
parameterOne,
expectedReturnValue,
returnValue,
}) => ({
type: actionTypes.UPDATE_HOOKRENDER,
id,
hookRenderFolder,
hookFuncFolder,
hookFunction,
parameterOne,
expectedReturnValue,
returnValue,
});
=======
export const updateHooksFilePath = (hookFileName, hookFilePath) => ({
type: actionTypes.UPDATE_HOOKS_FILEPATH,
hookFileName,
hookFilePath,
});
>>>>>>>
// hookRender
export const addHookRender = () => ({
type: actionTypes.ADD_HOOKRENDER,
});
export const deleteHookRender = id => ({
type: actionTypes.DELETE_HOOKRENDER,
id,
});
export const updateHookRender = ({
id,
hookRenderFolder,
hookFuncFolder,
hookFunction,
parameterOne,
expectedReturnValue,
returnValue,
}) => ({
type: actionTypes.UPDATE_HOOKRENDER,
id,
hookRenderFolder,
hookFuncFolder,
hookFunction,
parameterOne,
expectedReturnValue,
returnValue,
});
export const updateHooksFilePath = (hookFileName, hookFilePath) => ({
type: actionTypes.UPDATE_HOOKS_FILEPATH,
hookFileName,
hookFilePath,
}); |
<<<<<<<
CLOSE_BROWSER_DOCS: 'CLOSE_BROWSER_DOCS',
EXPORT: 'EXPORT',
=======
NEW_TEST_CLOSE_BROWSER_DOCS: 'NEW_TEST_CLOSE_BROWSER_DOCS',
EXPORT_T: 'EXPORT',
>>>>>>>
NEW_TEST_CLOSE_BROWSER_DOCS: 'NEW_TEST_CLOSE_BROWSER_DOCS',
EXPORT: 'EXPORT', |
<<<<<<<
// Action type for hookRender
ADD_HOOKRENDER: 'ADD_HOOKRENDER',
DELETE_HOOKRENDER: 'DELETE_HOOKRENDER',
UPDATE_HOOKRENDER: 'UPDATE_HOOKRENDER',
=======
ADD_HOOK_UPDATES: 'ADD_HOOK_UPDATES',
DELETE_HOOK_UPDATES: 'DELETE_HOOK_UPDATE',
UPDATE_HOOK_UPDATES: 'UPDATE_HOOK_UPDATES',
UPDATE_ACTIONS_FILEPATH: 'UPDATE_ACTIONS_FILEPATH',
UPDATE_TYPES_FILEPATH: 'UPDATE_TYPES_FILEPATH',
UPDATE_REDUCERS_FILEPATH: 'UPDATE_REDUCERS_FILEPATH',
UPDATE_MIDDLEWARES_FILEPATH: 'UPDATE_MIDDLEWARES_FILEPATH',
CREATE_NEW_TEST: 'CREATE_NEW_TEST',
>>>>>>>
// Action type for hookRender
ADD_HOOKRENDER: 'ADD_HOOKRENDER',
DELETE_HOOKRENDER: 'DELETE_HOOKRENDER',
UPDATE_HOOKRENDER: 'UPDATE_HOOKRENDER',
ADD_HOOK_UPDATES: 'ADD_HOOK_UPDATES',
DELETE_HOOK_UPDATES: 'DELETE_HOOK_UPDATE',
UPDATE_HOOK_UPDATES: 'UPDATE_HOOK_UPDATES',
UPDATE_ACTIONS_FILEPATH: 'UPDATE_ACTIONS_FILEPATH',
UPDATE_TYPES_FILEPATH: 'UPDATE_TYPES_FILEPATH',
UPDATE_REDUCERS_FILEPATH: 'UPDATE_REDUCERS_FILEPATH',
UPDATE_MIDDLEWARES_FILEPATH: 'UPDATE_MIDDLEWARES_FILEPATH',
CREATE_NEW_TEST: 'CREATE_NEW_TEST',
<<<<<<<
actionType,
initialState,
reducerName,
updatedState,
=======
queryVariant,
querySelector,
queryValue,
typesFileName,
typesFilePath,
reducersFileName,
reducersFilePath,
matcherValue,
>>>>>>>
queryVariant,
querySelector,
queryValue,
typesFileName,
typesFilePath,
reducersFileName,
reducersFilePath,
matcherValue,
<<<<<<<
actionType,
initialState,
reducerName,
updatedState,
=======
queryVariant,
querySelector,
queryValue,
typesFileName,
typesFilePath,
reducersFileName,
reducersFilePath,
matcherValue,
>>>>>>>
queryVariant,
querySelector,
queryValue,
typesFileName,
typesFilePath,
reducersFileName,
reducersFilePath,
matcherValue, |
<<<<<<<
import { faPlus, faMinus, faTimes } from "@fortawesome/free-solid-svg-icons";
import FileTree from './FileTree';
export const FileTreeContext = createContext(null);
export const FileCodeContext = createContext(null);
export const LoadedContext = createContext(false);
=======
import {
faPlus,
faMinus,
faTimes,
faQuestionCircle
} from "@fortawesome/free-solid-svg-icons";
>>>>>>>
import {
faPlus,
faMinus,
faTimes,
faQuestionCircle
} from "@fortawesome/free-solid-svg-icons";
export const FileTreeContext = createContext(null);
export const FileCodeContext = createContext(null);
export const LoadedContext = createContext(false); |
<<<<<<<
this.openShareTextcoinModal = function(addr, mnemonic, isResend) {
var text = "Your link: https://byteball.org/openapp.html#textcoin?" + mnemonic;
var subject = "Byteball user beamed you money";
=======
this.openShareTextcoinModal = function(addr, mnemonic, amount, isResend) {
var text = "Your link to claim " + amount + " bytes : https://byteball.org/openapp.html#textcoin?" + mnemonic;
var subject = "You received byteball transaction";
>>>>>>>
this.openShareTextcoinModal = function(addr, mnemonic, amount, isResend) {
var text = "Your link to claim " + amount + " bytes : https://byteball.org/openapp.html#textcoin?" + mnemonic;
var subject = "Byteball user beamed you money";
<<<<<<<
message: "Here is your link to receive bytes https://byteball.org/openapp.html#textcoin?" + mnemonic, subject: "Byteball user beamed you money"
=======
message: "Here is your link to receive "+(amount-constants.TEXTCOIN_CLAIM_FEE)+" bytes https://byteball.org/openapp.html#textcoin?" + mnemonic, subject: "You received byteball transaction"
>>>>>>>
message: "Here is your link to receive "+(amount-constants.TEXTCOIN_CLAIM_FEE)+" bytes https://byteball.org/openapp.html#textcoin?" + mnemonic, subject: "Byteball user beamed you money"
<<<<<<<
message: "Here is your link to receive bytes: https://byteball.org/openapp.html#textcoin?" + btx.mnemonic, subject: "Byteball user beamed you money"
=======
message: "Here is your link to receive "+(btx.amount-constants.TEXTCOIN_CLAIM_FEE)+" bytes: https://byteball.org/openapp.html#textcoin?" + btx.mnemonic, subject: "You received byteball transaction"
>>>>>>>
message: "Here is your link to receive "+(btx.amount-constants.TEXTCOIN_CLAIM_FEE)+" bytes: https://byteball.org/openapp.html#textcoin?" + btx.mnemonic, subject: "Byteball user beamed you money" |
<<<<<<<
//added
SET_TEST_CASE: 'SET_TEST_CASE',
TOGGLE_MODAL: 'TOGGLE_MODAL',
=======
UPDATE_FILE_SHOW: 'UPDATE_FILE_SHOW',
OPEN_BROWSER_DOCS: 'OPEN_BROWSER_DOCS',
CLOSE_BROWSER_DOCS: 'CLOSE_BROWSER_DOCS',
>>>>>>>
//added
SET_TEST_CASE: 'SET_TEST_CASE',
TOGGLE_MODAL: 'TOGGLE_MODAL',
UPDATE_FILE_SHOW: 'UPDATE_FILE_SHOW',
OPEN_BROWSER_DOCS: 'OPEN_BROWSER_DOCS',
CLOSE_BROWSER_DOCS: 'CLOSE_BROWSER_DOCS',
<<<<<<<
});
//added
export const setTestCase = (testCase) => ({
type: actionTypes.SET_TEST_CASE,
testCase,
});
export const toggleModal = () => ({
type: actionTypes.TOGGLE_MODAL,
=======
});
export const updateFile = (testString) => ({
type: actionTypes.UPDATE_FILE_SHOW,
testString,
});
export const openBrowserDocs = (docsUrl) => ({
type: actionTypes.OPEN_BROWSER_DOCS,
docsUrl,
>>>>>>>
});
//added
export const setTestCase = (testCase) => ({
type: actionTypes.SET_TEST_CASE,
testCase,
});
export const toggleModal = () => ({
type: actionTypes.TOGGLE_MODAL,
});
export const updateFile = (testString) => ({
type: actionTypes.UPDATE_FILE_SHOW,
testString,
});
export const openBrowserDocs = (docsUrl) => ({
type: actionTypes.OPEN_BROWSER_DOCS,
docsUrl, |
<<<<<<<
"a newer version, use `trust:TRUST_SIGNED_CERTIFICATES` in your driver " +
"config instead, or disable encryption using `encrypted:\"" + ENCRYPTION_OFF+ "\"`."));
=======
"a newer version, use `trust:TRUST_CUSTOM_CA_SIGNED_CERTIFICATES` in your driver " +
"config instead, or disable encryption using `encrypted:false`."));
>>>>>>>
"a newer version, use `trust:TRUST_CUSTOM_CA_SIGNED_CERTIFICATES` in your driver " +
"config instead, or disable encryption using `encrypted:\"" + ENCRYPTION_OFF+ "\"`.")); |
<<<<<<<
var driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"));
=======
driverGlobal = neo4j.driver("bolt://localhost:7687", neo4j.auth.basic("neo4j", "neo4j"));
>>>>>>>
var driver = neo4j.driver("bolt://localhost:7687", neo4j.auth.basic("neo4j", "neo4j"));
<<<<<<<
tx.run( "CREATE (:Person {name: 'Guinevere'})" );
tx.commit().then(function() {session.close()});
=======
tx.run( "CREATE (:Person {name: {name}})", {name: "Guinevere"} );
tx.commit();
>>>>>>>
tx.run( "CREATE (:Person {name: {name}})", {name: "Guinevere"} );
tx.commit().then(function() {session.close()});
<<<<<<<
tx.run( "CREATE (:Person {name: 'Merlin'})" );
tx.rollback().then(function() {session.close()});
=======
tx.run( "CREATE (:Person {name: {name}})", {name: "Merlin"});
tx.rollback();
>>>>>>>
tx.run( "CREATE (:Person {name: {name}})", {name: "Merlin"});
tx.rollback().then(function() {session.close()});
<<<<<<<
var driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"), {
//In NodeJS, encryption is ENCRYPTION_NON_LOCAL on by default. In the web bundle, it is ENCRYPTION_OFF.
encrypted:"ENCRYPTION_ON"
=======
var driver = neo4j.driver("bolt://localhost:7687", neo4j.auth.basic("neo4j", "neo4j"), {
// In NodeJS, encryption is on by default. In the web bundle, it is off.
encrypted:true
>>>>>>>
var driver = neo4j.driver("bolt://localhost:7687", neo4j.auth.basic("neo4j", "neo4j"), {
//In NodeJS, encryption is ENCRYPTION_NON_LOCAL on by default. In the web bundle, it is ENCRYPTION_OFF.
encrypted:"ENCRYPTION_ON" |
<<<<<<<
import DummyChannel from './dummy-channel'
import Connection from '../../src/internal/connection'
import { Packer } from '../../src/internal/packstream-v1'
import { Chunker } from '../../src/internal/chunking'
import { alloc } from '../../src/internal/node'
import { Neo4jError, newError, SERVICE_UNAVAILABLE } from '../../src/error'
import sharedNeo4j from '../internal/shared-neo4j'
import { ServerVersion, VERSION_3_5_0 } from '../../src/internal/server-version'
import lolex from 'lolex'
import Logger from '../../src/internal/logger'
import StreamObserver from '../../src/internal/stream-observer'
import ConnectionErrorHandler from '../../src/internal/connection-error-handler'
import testUtils from '../internal/test-utils'
import Bookmark from '../../src/internal/bookmark'
import TxConfig from '../../src/internal/tx-config'
import { WRITE } from '../../src/driver'
const ILLEGAL_MESSAGE = { signature: 42, fields: [] }
const SUCCESS_MESSAGE = { signature: 0x70, fields: [{}] }
const FAILURE_MESSAGE = { signature: 0x7f, fields: [newError('Hello')] }
const RECORD_MESSAGE = { signature: 0x71, fields: [{ value: 'Hello' }] }
=======
import DummyChannel from './dummy-channel';
import Connection from '../../src/v1/internal/connection';
import {Packer} from '../../src/v1/internal/packstream-v1';
import {Chunker} from '../../src/v1/internal/chunking';
import {alloc} from '../../src/v1/internal/node';
import {Neo4jError, newError, SERVICE_UNAVAILABLE} from '../../src/v1/error';
import sharedNeo4j from '../internal/shared-neo4j';
import {ServerVersion, VERSION_3_5_0} from '../../src/v1/internal/server-version';
import lolex from 'lolex';
import Logger from '../../src/v1/internal/logger';
import StreamObserver from '../../src/v1/internal/stream-observer';
import ConnectionErrorHandler from '../../src/v1/internal/connection-error-handler';
import testUtils from '../internal/test-utils';
import Bookmark from '../../src/v1/internal/bookmark';
import TxConfig from '../../src/v1/internal/tx-config';
import {WRITE} from "../../src/v1/driver";
import ServerAddress from '../../src/v1/internal/server-address';
const ILLEGAL_MESSAGE = {signature: 42, fields: []};
const SUCCESS_MESSAGE = {signature: 0x70, fields: [{}]};
const FAILURE_MESSAGE = {signature: 0x7F, fields: [newError('Hello')]};
const RECORD_MESSAGE = {signature: 0x71, fields: [{value: 'Hello'}]};
>>>>>>>
import DummyChannel from './dummy-channel'
import Connection from '../../src/internal/connection'
import { Packer } from '../../src/internal/packstream-v1'
import { Chunker } from '../../src/internal/chunking'
import { alloc } from '../../src/internal/node'
import { Neo4jError, newError, SERVICE_UNAVAILABLE } from '../../src/error'
import sharedNeo4j from '../internal/shared-neo4j'
import { ServerVersion, VERSION_3_5_0 } from '../../src/internal/server-version'
import lolex from 'lolex'
import Logger from '../../src/internal/logger'
import StreamObserver from '../../src/internal/stream-observer'
import ConnectionErrorHandler from '../../src/internal/connection-error-handler'
import testUtils from '../internal/test-utils'
import Bookmark from '../../src/internal/bookmark'
import TxConfig from '../../src/internal/tx-config'
import { WRITE } from '../../src/driver'
import ServerAddress from '../../src/internal/server-address'
const ILLEGAL_MESSAGE = { signature: 42, fields: [] }
const SUCCESS_MESSAGE = { signature: 0x70, fields: [{}] }
const FAILURE_MESSAGE = { signature: 0x7f, fields: [newError('Hello')] }
const RECORD_MESSAGE = { signature: 0x71, fields: [{ value: 'Hello' }] }
<<<<<<<
const channel = new DummyChannel()
connection = new Connection(
channel,
new ConnectionErrorHandler(SERVICE_UNAVAILABLE),
'localhost:7687',
Logger.noOp()
)
connection._negotiateProtocol()
const boltMagicPreamble = '60 60 b0 17'
const protocolVersion4 = '00 00 00 04'
const protocolVersion3 = '00 00 00 03'
const protocolVersion2 = '00 00 00 02'
const protocolVersion1 = '00 00 00 01'
expect(channel.toHex()).toBe(
`${boltMagicPreamble} ${protocolVersion4} ${protocolVersion3} ${protocolVersion2} ${protocolVersion1}`
)
})
=======
const channel = new DummyChannel();
connection = new Connection(channel, new ConnectionErrorHandler(SERVICE_UNAVAILABLE), ServerAddress.fromUrl('localhost:7687'), Logger.noOp());
connection._negotiateProtocol();
const boltMagicPreamble = '60 60 b0 17';
const protocolVersion3 = '00 00 00 03';
const protocolVersion2 = '00 00 00 02';
const protocolVersion1 = '00 00 00 01';
const noProtocolVersion = '00 00 00 00';
expect(channel.toHex()).toBe(`${boltMagicPreamble} ${protocolVersion3} ${protocolVersion2} ${protocolVersion1} ${noProtocolVersion}`);
});
>>>>>>>
const channel = new DummyChannel()
connection = new Connection(
channel,
new ConnectionErrorHandler(SERVICE_UNAVAILABLE),
ServerAddress.fromUrl('localhost:7687'),
Logger.noOp()
)
connection._negotiateProtocol()
const boltMagicPreamble = '60 60 b0 17'
const protocolVersion4 = '00 00 00 04'
const protocolVersion3 = '00 00 00 03'
const protocolVersion2 = '00 00 00 02'
const protocolVersion1 = '00 00 00 01'
expect(channel.toHex()).toBe(
`${boltMagicPreamble} ${protocolVersion4} ${protocolVersion3} ${protocolVersion2} ${protocolVersion1}`
)
})
<<<<<<<
const channel = new DummyChannel()
connection = new Connection(
channel,
new ConnectionErrorHandler(SERVICE_UNAVAILABLE),
'localhost:7687',
Logger.noOp()
)
=======
const channel = new DummyChannel();
connection = new Connection(channel, new ConnectionErrorHandler(SERVICE_UNAVAILABLE), ServerAddress.fromUrl('localhost:7687'), Logger.noOp());
>>>>>>>
const channel = new DummyChannel()
connection = new Connection(
channel,
new ConnectionErrorHandler(SERVICE_UNAVAILABLE),
ServerAddress.fromUrl('localhost:7687'),
Logger.noOp()
)
<<<<<<<
function createConnection (url, config, errorCode = null) {
return Connection.create(
url,
config || {},
new ConnectionErrorHandler(errorCode || SERVICE_UNAVAILABLE),
Logger.noOp()
)
=======
function createConnection(url, config, errorCode = null) {
return Connection.create(ServerAddress.fromUrl(url), config || {}, new ConnectionErrorHandler(errorCode || SERVICE_UNAVAILABLE), Logger.noOp());
>>>>>>>
function createConnection (url, config, errorCode = null) {
return Connection.create(
ServerAddress.fromUrl(url),
config || {},
new ConnectionErrorHandler(errorCode || SERVICE_UNAVAILABLE),
Logger.noOp()
) |
<<<<<<<
import { READ, WRITE } from '../../src/driver'
import Integer, { int } from '../../src/integer'
import { SERVICE_UNAVAILABLE, SESSION_EXPIRED } from '../../src/error'
import RoutingTable from '../../src/internal/routing-table'
import {
DirectConnectionProvider,
LoadBalancer
} from '../../src/internal/connection-providers'
import Pool from '../../src/internal/pool'
import LeastConnectedLoadBalancingStrategy from '../../src/internal/least-connected-load-balancing-strategy'
import Logger from '../../src/internal/logger'
import SimpleHostNameResolver from '../../src/internal/browser/browser-host-name-resolver'
const NO_OP_DRIVER_CALLBACK = () => {}
=======
import {READ, WRITE} from '../../src/v1/driver';
import Integer, {int} from '../../src/v1/integer';
import {SERVICE_UNAVAILABLE, SESSION_EXPIRED} from '../../src/v1/error';
import RoutingTable from '../../src/v1/internal/routing-table';
import {DirectConnectionProvider, LoadBalancer} from '../../src/v1/internal/connection-providers';
import Pool from '../../src/v1/internal/pool';
import LeastConnectedLoadBalancingStrategy from '../../src/v1/internal/least-connected-load-balancing-strategy';
import Logger from '../../src/v1/internal/logger';
import SimpleHostNameResolver from '../../src/v1/internal/browser/browser-host-name-resolver';
import ServerAddress from '../../src/v1/internal/server-address';
const NO_OP_DRIVER_CALLBACK = () => {
};
>>>>>>>
import { READ, WRITE } from '../../src/driver'
import Integer, { int } from '../../src/integer'
import { SERVICE_UNAVAILABLE, SESSION_EXPIRED } from '../../src/error'
import RoutingTable from '../../src/internal/routing-table'
import {
DirectConnectionProvider,
LoadBalancer
} from '../../src/internal/connection-providers'
import Pool from '../../src/internal/pool'
import LeastConnectedLoadBalancingStrategy from '../../src/internal/least-connected-load-balancing-strategy'
import Logger from '../../src/internal/logger'
import SimpleHostNameResolver from '../../src/internal/browser/browser-host-name-resolver'
import ServerAddress from '../../src/internal/server-address'
const NO_OP_DRIVER_CALLBACK = () => {}
<<<<<<<
const pool = newPool()
const connectionProvider = newDirectConnectionProvider(
'localhost:123',
pool
)
=======
const address = ServerAddress.fromUrl('localhost:123');
const pool = newPool();
const connectionProvider = newDirectConnectionProvider(address, pool);
>>>>>>>
const address = ServerAddress.fromUrl('localhost:123')
const pool = newPool()
const connectionProvider = newDirectConnectionProvider(address, pool)
<<<<<<<
expect(connection).toBeDefined()
expect(connection.address).toEqual('localhost:123')
expect(connection.release).toBeDefined()
expect(pool.has('localhost:123')).toBeTruthy()
=======
expect(connection).toBeDefined();
expect(connection.address).toEqual(address);
expect(connection.release).toBeDefined();
expect(pool.has(address)).toBeTruthy();
done();
});
});
>>>>>>>
expect(connection).toBeDefined()
expect(connection.address).toEqual(address)
expect(connection.release).toBeDefined()
expect(pool.has(address)).toBeTruthy()
<<<<<<<
=======
const server0 = ServerAddress.fromUrl('server0');
const server1 = ServerAddress.fromUrl('server1');
const server2 = ServerAddress.fromUrl('server2');
const server3 = ServerAddress.fromUrl('server3');
const server4 = ServerAddress.fromUrl('server4');
const server5 = ServerAddress.fromUrl('server5');
const server6 = ServerAddress.fromUrl('server6');
const server7 = ServerAddress.fromUrl('server7');
const server42 = ServerAddress.fromUrl('server42');
const server01 = ServerAddress.fromUrl('server01');
const server02 = ServerAddress.fromUrl('server02');
const server03 = ServerAddress.fromUrl('server03');
const serverA = ServerAddress.fromUrl('serverA');
const serverB = ServerAddress.fromUrl('serverB');
const serverC = ServerAddress.fromUrl('serverC');
const serverD = ServerAddress.fromUrl('serverD');
const serverE = ServerAddress.fromUrl('serverE');
const serverF = ServerAddress.fromUrl('serverF');
const serverG = ServerAddress.fromUrl('serverG');
const serverAA = ServerAddress.fromUrl('serverAA');
const serverBB = ServerAddress.fromUrl('serverBB');
const serverCC = ServerAddress.fromUrl('serverCC');
const serverDD = ServerAddress.fromUrl('serverDD');
const serverEE = ServerAddress.fromUrl('serverEE');
const serverABC = ServerAddress.fromUrl('serverABC');
>>>>>>>
const server0 = ServerAddress.fromUrl('server0')
const server1 = ServerAddress.fromUrl('server1')
const server2 = ServerAddress.fromUrl('server2')
const server3 = ServerAddress.fromUrl('server3')
const server4 = ServerAddress.fromUrl('server4')
const server5 = ServerAddress.fromUrl('server5')
const server6 = ServerAddress.fromUrl('server6')
const server7 = ServerAddress.fromUrl('server7')
const server42 = ServerAddress.fromUrl('server42')
const server01 = ServerAddress.fromUrl('server01')
const server02 = ServerAddress.fromUrl('server02')
const server03 = ServerAddress.fromUrl('server03')
const serverA = ServerAddress.fromUrl('serverA')
const serverB = ServerAddress.fromUrl('serverB')
const serverC = ServerAddress.fromUrl('serverC')
const serverD = ServerAddress.fromUrl('serverD')
const serverE = ServerAddress.fromUrl('serverE')
const serverF = ServerAddress.fromUrl('serverF')
const serverG = ServerAddress.fromUrl('serverG')
const serverAA = ServerAddress.fromUrl('serverAA')
const serverBB = ServerAddress.fromUrl('serverBB')
const serverCC = ServerAddress.fromUrl('serverCC')
const serverDD = ServerAddress.fromUrl('serverDD')
const serverEE = ServerAddress.fromUrl('serverEE')
const serverABC = ServerAddress.fromUrl('serverABC')
<<<<<<<
pool.acquire('server-1')
pool.acquire('server-3')
pool.acquire('server-5')
expectPoolToContain(pool, ['server-1', 'server-3', 'server-5'])
=======
pool.acquire(server1);
pool.acquire(server3);
pool.acquire(server5);
expectPoolToContain(pool, [server1, server3, server5]);
>>>>>>>
pool.acquire(server1)
pool.acquire(server3)
pool.acquire(server5)
expectPoolToContain(pool, [server1, server3, server5])
<<<<<<<
const connectionPool = newPool()
const loadBalancingStrategy = new LeastConnectedLoadBalancingStrategy(
connectionPool
)
const loadBalancer = new LoadBalancer(
'server-ABC',
{},
connectionPool,
loadBalancingStrategy,
new SimpleHostNameResolver(),
NO_OP_DRIVER_CALLBACK,
Logger.noOp()
)
expectRoutingTable(loadBalancer, ['server-ABC'], [], [])
})
=======
const connectionPool = newPool();
const loadBalancingStrategy = new LeastConnectedLoadBalancingStrategy(connectionPool);
const loadBalancer = new LoadBalancer(serverABC, {}, connectionPool, loadBalancingStrategy, new SimpleHostNameResolver(),
NO_OP_DRIVER_CALLBACK, Logger.noOp());
expectRoutingTable(loadBalancer,
[],
[],
[]
);
});
>>>>>>>
const connectionPool = newPool()
const loadBalancingStrategy = new LeastConnectedLoadBalancingStrategy(
connectionPool
)
const loadBalancer = new LoadBalancer(
serverABC,
{},
connectionPool,
loadBalancingStrategy,
new SimpleHostNameResolver(),
NO_OP_DRIVER_CALLBACK,
Logger.noOp()
)
expectRoutingTable(loadBalancer, [], [], [])
})
<<<<<<<
['server-1', 'server-2'],
['server-3', 'server-4'],
['server-5', 'server-6']
)
=======
[server1, server2],
[server3, server4],
[server5, server6]
);
>>>>>>>
[server1, server2],
[server3, server4],
[server5, server6]
)
<<<<<<<
['server-A', 'server-B'],
['server-C', 'server-D'],
['server-E', 'server-F']
)
=======
[serverA, serverB],
[serverC, serverD],
[serverE, serverF]
);
>>>>>>>
[serverA, serverB],
[serverC, serverD],
[serverE, serverF]
)
<<<<<<<
['server-A', 'server-B'],
['server-C', 'server-D'],
['server-E', 'server-F']
)
=======
[serverA, serverB],
[serverC, serverD],
[serverE, serverF]
);
>>>>>>>
[serverA, serverB],
[serverC, serverD],
[serverE, serverF]
)
<<<<<<<
'server-1': null, // returns no routing table
'server-2': null // returns no routing table
=======
'server1:7687': null, // returns no routing table
'server2:7687': null // returns no routing table
>>>>>>>
'server1:7687': null, // returns no routing table
'server2:7687': null // returns no routing table
<<<<<<<
'server-1': null, // returns no routing table
'server-2': null // returns no routing table
=======
'server1:7687': null, // returns no routing table
'server2:7687': null // returns no routing table
>>>>>>>
'server1:7687': null, // returns no routing table
'server2:7687': null // returns no routing table
<<<<<<<
['server-C', 'server-D']
)
=======
[serverC, serverD]
);
>>>>>>>
[serverC, serverD]
)
<<<<<<<
['server-A', 'server-B'],
['server-C', 'server-D'],
['server-E', 'server-F']
)
=======
[serverA, serverB],
[serverC, serverD],
[serverE, serverF]
);
>>>>>>>
[serverA, serverB],
[serverC, serverD],
[serverE, serverF]
)
<<<<<<<
expectRoutingTable(
loadBalancer,
['server-A', 'server-B'],
['server-C', 'server-D'],
['server-E', 'server-F']
)
expectPoolToNotContain(pool, [
'server-1',
'server-2',
'server-3',
'server-4',
'server-5',
'server-6'
])
done()
})
})
=======
expectRoutingTable(loadBalancer,
[serverA, serverB],
[serverC, serverD],
[serverE, serverF]
);
expectPoolToNotContain(pool, [server1, server2, server3, server4, server5, server6]);
done();
});
});
>>>>>>>
expectRoutingTable(
loadBalancer,
[serverA, serverB],
[serverC, serverD],
[serverE, serverF]
)
expectPoolToNotContain(pool, [
server1,
server2,
server3,
server4,
server5,
server6
])
done()
})
})
<<<<<<<
['server-4', 'server-5'],
['server-6', 'server-7']
)
done()
})
})
=======
[server4, server5],
[server6, server7]
);
done();
});
});
>>>>>>>
[server4, server5],
[server6, server7]
)
done()
})
})
<<<<<<<
['server-4', 'server-5'],
['server-6', 'server-7']
)
done()
})
})
=======
[server4, server5],
[server6, server7]
);
done();
});
});
>>>>>>>
[server4, server5],
[server6, server7]
)
done()
})
})
<<<<<<<
'server-0',
['server-0'], // seed router address resolves just to itself
['server-1', 'server-2', 'server-3'],
['server-4', 'server-5'],
['server-6'],
=======
server0, [server0], // seed router address resolves just to itself
[server1, server2, server3],
[server4, server5],
[server6],
>>>>>>>
server0,
[server0], // seed router address resolves just to itself
[server1, server2, server3],
[server4, server5],
[server6],
<<<<<<<
['server-4', 'server-5'],
['server-6']
)
=======
[server4, server5],
[server6],
);
>>>>>>>
[server4, server5],
[server6]
)
<<<<<<<
['server-4', 'server-5'],
['server-6']
)
=======
[server4, server5],
[server6],
);
>>>>>>>
[server4, server5],
[server6]
)
<<<<<<<
'server-0',
['server-01'], // seed router address resolves to a different one
['server-1', 'server-2'],
['server-3'],
['server-4'],
=======
server0, [server01], // seed router address resolves to a different one
[server1, server2],
[server3],
[server4],
>>>>>>>
server0,
[server01], // seed router address resolves to a different one
[server1, server2],
[server3],
[server4],
<<<<<<<
['server-3'],
['server-4']
)
=======
[server3],
[server4],
);
>>>>>>>
[server3],
[server4]
)
<<<<<<<
['server-3'],
['server-4']
)
=======
[server3],
[server4],
);
>>>>>>>
[server3],
[server4]
)
<<<<<<<
'server-0',
['server-02', 'server-01'], // seed router address resolves to 2 different addresses
['server-1', 'server-2', 'server-3'],
['server-4'],
['server-5'],
=======
server0, [server02, server01], // seed router address resolves to 2 different addresses
[server1, server2, server3],
[server4],
[server5],
>>>>>>>
server0,
[server02, server01], // seed router address resolves to 2 different addresses
[server1, server2, server3],
[server4],
[server5],
<<<<<<<
['server-4'],
['server-5']
)
=======
[server4],
[server5],
);
>>>>>>>
[server4],
[server5]
)
<<<<<<<
['server-4'],
['server-5']
)
=======
[server4],
[server5],
);
>>>>>>>
[server4],
[server5]
)
<<<<<<<
'server-1': updatedRoutingTable
=======
'server1:7687': updatedRoutingTable,
>>>>>>>
'server1:7687': updatedRoutingTable
<<<<<<<
lookupRoutingTableOnRouter (ignored, router) {
return this._routerToRoutingTable[router]
=======
lookupRoutingTableOnRouter(ignored, router) {
return Promise.resolve(this._routerToRoutingTable[router.asKey()]);
>>>>>>>
lookupRoutingTableOnRouter (ignored, router) {
return Promise.resolve(this._routerToRoutingTable[router.asKey()]) |
<<<<<<<
it('should notify when connection initialization completes', done => {
const connection = connect('bolt://localhost');
connection.initializationCompleted().then(initializedConnection => {
expect(initializedConnection).toBe(connection);
done();
});
connection.initialize('mydriver/0.0.0', basicAuthToken());
});
it('should notify when connection initialization fails', done => {
const connection = connect('bolt://localhost:7474'); // wrong port
connection.initializationCompleted().catch(error => {
expect(error).toBeDefined();
done();
});
connection.initialize('mydriver/0.0.0', basicAuthToken());
});
it('should notify provided observer when connection initialization completes', done => {
const connection = connect('bolt://localhost');
connection.initialize('mydriver/0.0.0', basicAuthToken(), {
onCompleted: metaData => {
expect(metaData).toBeDefined();
done();
},
});
});
it('should notify provided observer when connection initialization fails', done => {
const connection = connect('bolt://localhost:7474'); // wrong port
connection.initialize('mydriver/0.0.0', basicAuthToken(), {
onError: error => {
expect(error).toBeDefined();
done();
},
});
});
it('should have server version after connection initialization completed', done => {
const connection = connect('bolt://localhost');
connection.initializationCompleted().then(initializedConnection => {
const serverVersion = ServerVersion.fromString(initializedConnection.server.version);
expect(serverVersion).toBeDefined();
done();
});
connection.initialize('mydriver/0.0.0', basicAuthToken());
});
=======
it('should notify provided observer when connection initialization completes', done => {
const connection = connect('bolt://localhost');
connection.initialize('mydriver/0.0.0', basicAuthToken(), {
onCompleted: metaData => {
expect(connection.isOpen()).toBeTruthy();
expect(metaData).toBeDefined();
done();
},
});
});
it('should notify provided observer when connection initialization fails', done => {
const connection = connect('bolt://localhost:7474'); // wrong port
connection.initialize('mydriver/0.0.0', basicAuthToken(), {
onError: error => {
expect(connection.isOpen()).toBeFalsy();
expect(error).toBeDefined();
done();
},
});
});
it('should fail all new observers after initialization error', done => {
const connection = connect('bolt://localhost:7474'); // wrong port
connection.initialize('mydriver/0.0.0', basicAuthToken(), {
onError: initialError => {
expect(initialError).toBeDefined();
connection.run('RETURN 1', {}, {
onError: error1 => {
expect(error1).toEqual(initialError);
connection.initialize('mydriver/0.0.0', basicAuthToken(), {
onError: error2 => {
expect(error2).toEqual(initialError);
done();
}
});
}
});
},
});
});
>>>>>>>
it('should notify when connection initialization completes', done => {
const connection = connect('bolt://localhost');
connection.initializationCompleted().then(initializedConnection => {
expect(initializedConnection).toBe(connection);
done();
});
connection.initialize('mydriver/0.0.0', basicAuthToken());
});
it('should notify when connection initialization fails', done => {
const connection = connect('bolt://localhost:7474'); // wrong port
connection.initializationCompleted().catch(error => {
expect(error).toBeDefined();
done();
});
connection.initialize('mydriver/0.0.0', basicAuthToken());
});
it('should notify provided observer when connection initialization completes', done => {
const connection = connect('bolt://localhost');
connection.initialize('mydriver/0.0.0', basicAuthToken(), {
onCompleted: metaData => {
expect(connection.isOpen()).toBeTruthy();
expect(metaData).toBeDefined();
done();
},
});
});
it('should notify provided observer when connection initialization fails', done => {
const connection = connect('bolt://localhost:7474'); // wrong port
connection.initialize('mydriver/0.0.0', basicAuthToken(), {
onError: error => {
expect(connection.isOpen()).toBeFalsy();
expect(error).toBeDefined();
done();
},
});
});
it('should have server version after connection initialization completed', done => {
const connection = connect('bolt://localhost');
connection.initializationCompleted().then(initializedConnection => {
const serverVersion = ServerVersion.fromString(initializedConnection.server.version);
expect(serverVersion).toBeDefined();
done();
});
connection.initialize('mydriver/0.0.0', basicAuthToken());
});
it('should fail all new observers after initialization error', done => {
const connection = connect('bolt://localhost:7474'); // wrong port
connection.initialize('mydriver/0.0.0', basicAuthToken(), {
onError: initialError => {
expect(initialError).toBeDefined();
connection.run('RETURN 1', {}, {
onError: error1 => {
expect(error1).toEqual(initialError);
connection.initialize('mydriver/0.0.0', basicAuthToken(), {
onError: error2 => {
expect(error2).toEqual(initialError);
done();
}
});
}
});
},
});
}); |
<<<<<<<
encrypted: "ENCRYPTION_ON",
trust: "TRUST_SIGNED_CERTIFICATES",
=======
encrypted: true,
trust: "TRUST_CUSTOM_CA_SIGNED_CERTIFICATES",
>>>>>>>
encrypted: "ENCRYPTION_ON",
trust: "TRUST_CUSTOM_CA_SIGNED_CERTIFICATES",
<<<<<<<
encrypted: "ENCRYPTION_ON",
trust: "TRUST_SIGNED_CERTIFICATES",
=======
encrypted: true,
trust: "TRUST_CUSTOM_CA_SIGNED_CERTIFICATES",
>>>>>>>
encrypted: "ENCRYPTION_ON",
trust: "TRUST_CUSTOM_CA_SIGNED_CERTIFICATES", |
<<<<<<<
import CustomEvent from './custom-event-ponyfill';
import {
isHandlerConvention,
objectFromArray,
mapObject,
setBooleanAttribute,
} from './util';
=======
import { isHandlerConvention, objectFromArray, mapObject } from './util';
>>>>>>>
import {
isHandlerConvention,
objectFromArray,
mapObject,
setBooleanAttribute,
} from './util';
<<<<<<<
setBooleanAttribute(this, name, value);
}
=======
if (value) {
this.setAttribute(name, '');
} else {
this.removeAttribute(name);
}
},
>>>>>>>
setBooleanAttribute(this, name, value);
}, |
<<<<<<<
interaction.resizeRects = {
start : startRect,
current : utils.extend({}, startRect),
inverted : utils.extend({}, startRect),
previous : utils.extend({}, startRect),
delta : {
left: 0, right : 0, width : 0,
top : 0, bottom: 0, height: 0,
},
};
resizeEvent.rect = interaction.resizeRects.inverted;
resizeEvent.deltaRect = interaction.resizeRects.delta;
=======
/*
* When using the `resizable.square` or `resizable.preserveAspectRatio` options, resizing from one edge
* will affect another. E.g. with `resizable.square`, resizing to make the right edge larger will make
* the bottom edge larger by the same amount. We call these 'linked' edges. Any linked edges will depend
* on the active edges and the edge being interacted with.
*/
if (resizeOptions.square || resizeOptions.preserveAspectRatio) {
const linkedEdges = utils.extend({}, interaction.prepared.edges);
linkedEdges.top = linkedEdges.top || (linkedEdges.left && !linkedEdges.bottom);
linkedEdges.left = linkedEdges.left || (linkedEdges.top && !linkedEdges.right );
linkedEdges.bottom = linkedEdges.bottom || (linkedEdges.right && !linkedEdges.top );
linkedEdges.right = linkedEdges.right || (linkedEdges.bottom && !linkedEdges.left );
interaction.prepared._linkedEdges = linkedEdges;
}
else {
interaction.prepared._linkedEdges = null;
>>>>>>>
/*
* When using the `resizable.square` or `resizable.preserveAspectRatio` options, resizing from one edge
* will affect another. E.g. with `resizable.square`, resizing to make the right edge larger will make
* the bottom edge larger by the same amount. We call these 'linked' edges. Any linked edges will depend
* on the active edges and the edge being interacted with.
*/
if (resizeOptions.square || resizeOptions.preserveAspectRatio) {
const linkedEdges = utils.extend({}, interaction.prepared.edges);
linkedEdges.top = linkedEdges.top || (linkedEdges.left && !linkedEdges.bottom);
linkedEdges.left = linkedEdges.left || (linkedEdges.top && !linkedEdges.right );
linkedEdges.bottom = linkedEdges.bottom || (linkedEdges.right && !linkedEdges.top );
linkedEdges.right = linkedEdges.right || (linkedEdges.bottom && !linkedEdges.left );
interaction.prepared._linkedEdges = linkedEdges;
}
else {
interaction.prepared._linkedEdges = null;
<<<<<<<
if (edges) {
const start = interaction.resizeRects.start;
const current = interaction.resizeRects.current;
const inverted = interaction.resizeRects.inverted;
const delta = interaction.resizeRects.delta;
const previous = utils.extend(interaction.resizeRects.previous, inverted);
const originalEdges = edges;
=======
const start = interaction.resizeRects.start;
const current = interaction.resizeRects.current;
const restricted = interaction.resizeRects.restricted;
const delta = interaction.resizeRects.delta;
const previous = utils.extend(interaction.resizeRects.previous, restricted);
const originalEdges = edges;
>>>>>>>
const start = interaction.resizeRects.start;
const current = interaction.resizeRects.current;
const inverted = interaction.resizeRects.inverted;
const delta = interaction.resizeRects.delta;
const previous = utils.extend(interaction.resizeRects.previous, inverted);
const originalEdges = edges;
<<<<<<<
// update the 'current' rect without modifications
if (edges.top ) { current.top += dy; }
if (edges.bottom) { current.bottom += dy; }
if (edges.left ) { current.left += dx; }
if (edges.right ) { current.right += dx; }
if (invertible) {
// if invertible, copy the current rect
utils.extend(inverted, current);
=======
// update the 'current' rect without modifications
if (edges.top ) { current.top += dy; }
if (edges.bottom) { current.bottom += dy; }
if (edges.left ) { current.left += dx; }
if (edges.right ) { current.right += dx; }
>>>>>>>
// update the 'current' rect without modifications
if (edges.top ) { current.top += dy; }
if (edges.bottom) { current.bottom += dy; }
if (edges.left ) { current.left += dx; }
if (edges.right ) { current.right += dx; } |
<<<<<<<
dropzones = [], // all dropzone element interactables
interactions = [],
=======
>>>>>>>
interactions = [],
<<<<<<<
for (var i = 0, len = interactions.length; i < len; i++) {
var interaction = interactions[i],
otherAction = /resize/.test(interaction.prepared)? 'resize': interaction.prepared,
active = interaction.dragging || interaction.resizing || interaction.gesturing;
=======
// collect all dropzones and their elements which qualify for a drop
for (i = 0; i < interactables.length; i++) {
if (!interactables[i].options.dropzone) { continue; }
var current = interactables[i];
>>>>>>>
for (var i = 0, len = interactions.length; i < len; i++) {
var interaction = interactions[i],
otherAction = /resize/.test(interaction.prepared)? 'resize': interaction.prepared,
active = interaction.dragging || interaction.resizing || interaction.gesturing;
<<<<<<<
this.pointerIsDown = true;
=======
// Use natural event coordinates (without snapping/restricions)
// subtract modifications from previous event if event given is
// not a native event
if (event instanceof InteractEvent) {
// change in time in seconds
// use event sequence duration for end events
// => average speed of the event sequence
// (minimum dt of 1ms)
dt = Math.max((ending? this.duration: this.dt) / 1000, 0.001);
dx = this[sourceX] - prevEvent[sourceX];
dy = this[sourceY] - prevEvent[sourceY];
>>>>>>>
this.pointerIsDown = true;
<<<<<<<
while (element) {
if (interact.isSet(element)) {
tapTargets.push(interact(element));
tapElements.push(element);
}
=======
if (!(event instanceof InteractEvent)) {
setEventXY(curCoords, event);
if (curCoords.pageX === prevCoords.pageX
&& curCoords.pageY === prevCoords.pageY
&& curCoords.screenX === prevCoords.screenX
&& curCoords.screenY === prevCoords.screenY) {
checkAndPreventDefault(event, target);
return;
}
// set pointer coordinate, time changes and speeds
setEventDeltas(pointerDelta, prevCoords, curCoords);
}
>>>>>>>
while (element) {
if (interact.isSet(element)) {
tapTargets.push(interact(element));
tapElements.push(element);
}
<<<<<<<
newX = gridx * snap.grid.x + snap.gridOffset.x + this.snapOffset.x,
newY = gridy * snap.grid.y + snap.gridOffset.y + this.snapOffset.y;
=======
if (!(event instanceof InteractEvent)) {
setEventXY(prevCoords, event);
}
>>>>>>>
newX = gridx * snap.grid.x + snap.gridOffset.x + this.snapOffset.x,
newY = gridy * snap.grid.y + snap.gridOffset.y + this.snapOffset.y;
<<<<<<<
var dx, dy, dt;
=======
var endEvent,
options = target && target.options,
inertiaOptions = options && options.inertia;
if (dragging || resizing || gesturing) {
if (inertiaStatus.active) { return; }
var pointerSpeed,
now = new Date().getTime(),
inertiaPossible = false,
inertia = false,
smoothEnd = false,
endSnap = checkSnap(target) && options.snap.endOnly,
endRestrict = checkRestrict(target) && options.restrict.endOnly,
dx = 0,
dy = 0,
startEvent;
if (dragging && options.dragAxis === 'x' ) { pointerSpeed = Math.abs(pointerDelta.clientVX); }
if (dragging && options.dragAxis === 'y' ) { pointerSpeed = Math.abs(pointerDelta.clientVY); }
if (dragging && options.dragAxis === 'xy') { pointerSpeed = pointerDelta.clientSpeed; }
// check if inertia should be started
inertiaPossible = (options.inertiaEnabled
&& prepared !== 'gesture'
&& contains(inertiaOptions.actions, prepared)
&& event !== inertiaStatus.startEvent);
inertia = (inertiaPossible
&& (now - curCoords.timeStamp) < 50
&& pointerSpeed > inertiaOptions.minSpeed
&& pointerSpeed > inertiaOptions.endSpeed);
if (inertiaPossible && !inertia && (endSnap || endRestrict)) {
var snapRestrict = {};
>>>>>>>
var dx, dy, dt;
<<<<<<<
=======
else {
inertiaStatus.pointerUp = event;
}
inertiaStatus.startEvent = startEvent = new InteractEvent(event, prepared, 'inertiastart');
target.fire(inertiaStatus.startEvent);
inertiaStatus.target = target;
inertiaStatus.targetElement = target._element;
inertiaStatus.t0 = now;
if (inertia) {
inertiaStatus.vx0 = pointerDelta.clientVX;
inertiaStatus.vy0 = pointerDelta.clientVY;
inertiaStatus.v0 = pointerSpeed;
calcInertia(inertiaStatus);
var page = getPageXY(event),
origin = getOriginXY(target, target._element),
statusObject;
page.x = page.x + (inertia? inertiaStatus.xe: 0) - origin.x;
page.y = page.y + (inertia? inertiaStatus.ye: 0) - origin.y;
>>>>>>>
<<<<<<<
var listeners = {},
interactionListeners = [
'dragStart', 'dragMove', 'resizeStart', 'resizeMove', 'gestureStart', 'gestureMove',
'pointerOver', 'pointerOut', 'pointerHover', 'selectorDown', 'pointerDown', 'pointerMove', 'pointerUp',
'addPointer', 'removePointer', 'recordPointer', 'collectTaps'
];
for (var i = 0, len = interactionListeners.length; i < len; i++) {
var name = interactionListeners[i];
=======
if (dropEvents.leave) { prevDropTarget.fire(dropEvents.leave); }
if (dropEvents.enter) { dropTarget.fire(dropEvents.enter); }
if (dropEvents.drop ) { dropTarget.fire(dropEvents.drop ); }
if (dropEvents.deactivate) {
fireActiveDrops(dropEvents.deactivate);
}
target.fire(endEvent);
}
else if (resizing) {
endEvent = new InteractEvent(event, 'resize', 'end');
target.fire(endEvent);
}
else if (gesturing) {
endEvent = new InteractEvent(event, 'gesture', 'end');
target.fire(endEvent);
}
>>>>>>>
var listeners = {},
interactionListeners = [
'dragStart', 'dragMove', 'resizeStart', 'resizeMove', 'gestureStart', 'gestureMove',
'pointerOver', 'pointerOut', 'pointerHover', 'selectorDown', 'pointerDown', 'pointerMove', 'pointerUp',
'addPointer', 'removePointer', 'recordPointer', 'collectTaps'
];
for (var i = 0, len = interactionListeners.length; i < len; i++) {
var name = interactionListeners[i];
<<<<<<<
dropzones : dropzones,
pointerIsDown : interaction.pointerIsDown,
=======
pointerIsDown : pointerIsDown,
>>>>>>>
pointerIsDown : interaction.pointerIsDown,
<<<<<<<
for (var i = interactions.length - 1; i > 0; i--) {
interactions[i].stop(event);
=======
if (dragging || resizing || gesturing) {
autoScroll.stop();
matches = [];
if (target.options.styleCursor) {
document.documentElement.style.cursor = '';
}
// prevent Default only if were previously interacting
if (event && isFunction(event.preventDefault)) {
checkAndPreventDefault(event, target);
}
if (dragging) {
activeDrops.dropzones = activeDrops.elements = activeDrops.rects = null;
}
clearTargets();
>>>>>>>
for (var i = interactions.length - 1; i > 0; i--) {
interactions[i].stop(event); |
<<<<<<<
=======
inertiaStatus.resumeDx = inertiaStatus.resumeDy = 0;
// do not clear the downEvent so that it can be used to
// test for browser-simulated mouse events after touch
>>>>>>>
inertiaStatus.resumeDx = inertiaStatus.resumeDy = 0; |
<<<<<<<
else if (eventType === 'tap') {
this.prevTap = pointerEvent;
=======
else {
this.prevTap = tap;
}
},
collectTaps: function (pointer, event, eventTarget) {
if(this.pointerWasMoved || !(this.downTarget && this.downTarget === eventTarget)) {
return;
}
var tapTargets = [],
tapElements = [];
var element = eventTarget;
function collectSelectorTaps (interactable, selector, context) {
var elements = ie8MatchesSelector
? context.querySelectorAll(selector)
: undefined;
if (element !== element.ownerDocument
&& inContext(interactable, element)
&& !testIgnore(interactable, element, eventTarget)
&& testAllow(interactable, element, eventTarget)
&& matchesSelector(element, selector, elements)) {
tapTargets.push(interactable);
tapElements.push(element);
}
}
while (element) {
if (interact.isSet(element)) {
tapTargets.push(interact(element));
tapElements.push(element);
}
interactables.forEachSelector(collectSelectorTaps);
element = element.parentNode;
}
if (tapTargets.length) {
this.fireTaps(pointer, event, tapTargets, tapElements);
>>>>>>>
else if (eventType === 'tap') {
this.prevTap = pointerEvent;
<<<<<<<
events.add(parentDocTarget , 'mouseup' , listeners.pointerEnd);
events.add(parentDocTarget , 'touchend' , listeners.pointerEnd);
events.add(parentDocTarget , 'touchcancel' , listeners.pointerEnd);
events.add(parentDocTarget , 'pointerup' , listeners.pointerEnd);
events.add(parentDocTarget , 'MSPointerUp' , listeners.pointerEnd);
events.add(parentWindowTarget, 'blur' , endAllInteractions );
=======
events.add(parentDoc , 'mouseup' , listeners.pointerUp);
events.add(parentDoc , 'touchend' , listeners.pointerUp);
events.add(parentDoc , 'touchcancel', listeners.pointerUp);
events.add(parentDoc , 'pointerup' , listeners.pointerUp);
events.add(parentDoc , 'MSPointerUp', listeners.pointerUp);
events.add(parentWindow, 'blur' , endAllInteractions );
}
>>>>>>>
events.add(parentDoc , 'mouseup' , listeners.pointerEnd);
events.add(parentDoc , 'touchend' , listeners.pointerEnd);
events.add(parentDoc , 'touchcancel' , listeners.pointerEnd);
events.add(parentDoc , 'pointerup' , listeners.pointerEnd);
events.add(parentDoc , 'MSPointerUp' , listeners.pointerEnd);
events.add(parentWindow, 'blur' , endAllInteractions );
} |
<<<<<<<
let userSafe = null;
const organizationTrustLimit = 100;
=======
let safeOwnerToken = null;
let normalUserToken = null;
let fourthUserToken = null;
>>>>>>>
let userSafe = null;
const organizationTrustLimit = 100;
let safeOwnerToken = null;
let normalUserToken = null;
let fourthUserToken = null;
<<<<<<<
await hub.trust(normalUser, organizationTrustLimit, { from: organization });
=======
await hub.trust(normalUser, trustLimit, { from: organization });
const safeOwnertokenAddress = await hub.userToToken(safeOwner);
safeOwnerToken = await Token.at(safeOwnertokenAddress);
const normalUsertokenAddress = await hub.userToToken(normalUser);
normalUserToken = await Token.at(normalUsertokenAddress);
>>>>>>>
await hub.trust(normalUser, organizationTrustLimit, { from: organization });
const safeOwnertokenAddress = await hub.userToToken(safeOwner);
safeOwnerToken = await Token.at(safeOwnertokenAddress);
const normalUsertokenAddress = await hub.userToToken(normalUser);
normalUserToken = await Token.at(normalUsertokenAddress);
<<<<<<<
await hub.trust(normalUser, organizationTrustLimit, { from: organization });
=======
await hub.trust(normalUser, trustLimit, { from: organization });
const safeOwnertokenAddress = await hub.userToToken(safeOwner);
safeOwnerToken = await Token.at(safeOwnertokenAddress);
const normalUsertokenAddress = await hub.userToToken(normalUser);
normalUserToken = await Token.at(normalUsertokenAddress);
>>>>>>>
await hub.trust(normalUser, organizationTrustLimit, { from: organization });
const safeOwnertokenAddress = await hub.userToToken(safeOwner);
safeOwnerToken = await Token.at(safeOwnertokenAddress);
const normalUsertokenAddress = await hub.userToToken(normalUser);
normalUserToken = await Token.at(normalUsertokenAddress); |
<<<<<<<
contract('Hub', ([_, systemOwner, attacker, safeOwner, normalUser]) => {
const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
=======
contract('Hub', ([_, systemOwner, attacker, safeOwner]) => { // eslint-disable-line no-unused-vars
>>>>>>>
contract('Hub', ([_, systemOwner, attacker, safeOwner, normalUser]) => { // eslint-disable-line no-unused-vars
<<<<<<<
const _issuance = new BigNumber(1736111111111111);
const _demurrage = new BigNumber(0);
const _symbol = 'CRC';
const _initialPayout = new BigNumber(100);
const _tokenName = 'testToken'
=======
const issuance = new BigNumber(1736111111111111);
const demurrage = new BigNumber(0);
const symbol = 'CRC';
const limitEpoch = new BigNumber(3600);
const initialPayout = new BigNumber(100);
const tokenName = 'testToken';
>>>>>>>
const issuance = new BigNumber(1736111111111111);
const demurrage = new BigNumber(0);
const symbol = 'CRC';
const initialPayout = new BigNumber(100);
const tokenName = 'testToken';
<<<<<<<
hub = await Hub.new(systemOwner, _issuance, _demurrage, _symbol, _initialPayout);
safe = await GnosisSafe.new({ from: safeOwner })
=======
hub = await Hub.new(systemOwner, issuance, demurrage, symbol, limitEpoch, initialPayout);
safe = await GnosisSafe.new({ from: safeOwner });
>>>>>>>
hub = await Hub.new(systemOwner, issuance, demurrage, symbol, initialPayout);
safe = await GnosisSafe.new({ from: safeOwner });
<<<<<<<
=======
it('has a limit epoch value', async () => {
(await hub.LIMIT_EPOCH()).should.be.bignumber.equal(limitEpoch);
});
it('attacker cannot change limit epoch', async () => {
await assertRevert(hub.updateLimitEpoch(42, { from: attacker }));
});
>>>>>>>
<<<<<<<
await hub.updateIssuance(_issuance, { from: systemOwner })
await hub.updateDemurrage(_demurrage, { from: systemOwner });
await hub.updateSymbol(_symbol, { from: systemOwner });
=======
await hub.updateIssuance(issuance, { from: systemOwner });
await hub.updateDemurrage(demurrage, { from: systemOwner });
await hub.updateSymbol(symbol, { from: systemOwner });
return hub.updateLimitEpoch(limitEpoch, { from: systemOwner });
>>>>>>>
await hub.updateIssuance(issuance, { from: systemOwner })
await hub.updateDemurrage(demurrage, { from: systemOwner });
await hub.updateSymbol(symbol, { from: systemOwner });
<<<<<<<
})
})
describe('user can set trust limits', async () => {
const trustLimit = 50;
describe('when trust destination is not a circles token', async () => {
beforeEach(async () => {
await hub.signup(_tokenName, { from: safeOwner });
});
it('should throw', async () => {
return assertRevert(hub.trust(normalUser, trustLimit));
});
});
describe('when trust destination is a circles token', async () => {
beforeEach(async () => {
await hub.signup(_tokenName, { from: safeOwner });
await hub.signup(_tokenName, { from: normalUser });
await hub.trust(normalUser, trustLimit, { from: safeOwner });
});
it('creates a trust event', async () => {
const logs = await hub.getPastEvents('Trust', { fromBlock: 0, toBlock: 'latest'});
return expectEvent.inLogs(logs, 'Trust', {
from: safeOwner,
to: normalUser
});
return event.args.limit.should.equal(new BigNumber(trustLimit));
});
})
// it('token is owned by correct sender', async () => {
// const logs = await hub.getPastEvents('Signup', { fromBlock: 0, toBlock: 'latest'});
// const event = expectEvent.inLogs(logs, 'Signup', {
// user: safeOwner,
// });
// tokenAddress = event.args.token;
// token = await Token.at(tokenAddress);
// (await token.owner()).should.be.equal(safeOwner);
// })
// it('token has the correct name', async () => {
// const logs = await hub.getPastEvents('Signup', { fromBlock: 0, toBlock: 'latest'});
// const event = expectEvent.inLogs(logs, 'Signup', {
// user: safeOwner,
// });
// tokenAddress = event.args.token;
// token = await Token.at(tokenAddress);
// (await token.name()).should.be.equal(_tokenName);
// })
// it('throws if sender tries to sign up twice', async () => {
// await assertRevert(hub.signup(_tokenName, { from: safeOwner }));
// })
})
=======
});
});
>>>>>>>
})
})
describe('user can set trust limits', async () => {
const trustLimit = 50;
describe('when trust destination is not a circles token', async () => {
beforeEach(async () => {
await hub.signup(tokenName, { from: safeOwner });
});
it('should throw', async () => {
return assertRevert(hub.trust(normalUser, trustLimit));
});
});
describe('when trust destination is a circles token', async () => {
beforeEach(async () => {
await hub.signup(tokenName, { from: safeOwner });
await hub.signup(tokenName, { from: normalUser });
await hub.trust(normalUser, trustLimit, { from: safeOwner });
});
it('creates a trust event', async () => {
const logs = await hub.getPastEvents('Trust', { fromBlock: 0, toBlock: 'latest'});
return expectEvent.inLogs(logs, 'Trust', {
from: safeOwner,
to: normalUser
});
return event.args.limit.should.equal(new BigNumber(trustLimit));
});
})
// it('token is owned by correct sender', async () => {
// const logs = await hub.getPastEvents('Signup', { fromBlock: 0, toBlock: 'latest'});
// const event = expectEvent.inLogs(logs, 'Signup', {
// user: safeOwner,
// });
// tokenAddress = event.args.token;
// token = await Token.at(tokenAddress);
// (await token.owner()).should.be.equal(safeOwner);
// })
// it('token has the correct name', async () => {
// const logs = await hub.getPastEvents('Signup', { fromBlock: 0, toBlock: 'latest'});
// const event = expectEvent.inLogs(logs, 'Signup', {
// user: safeOwner,
// });
// tokenAddress = event.args.token;
// token = await Token.at(tokenAddress);
// (await token.name()).should.be.equal(tokenName);
// })
// it('throws if sender tries to sign up twice', async () => {
// await assertRevert(hub.signup(_tokenName, { from: safeOwner }));
// })
}) |
<<<<<<<
'test/lib/select2/select2.js',
=======
'test/lib/maskedinput/jquery.maskedinput-1.3.js',
>>>>>>>
'test/lib/select2/select2.js',
'test/lib/maskedinput/jquery.maskedinput-1.3.js', |
<<<<<<<
// window.ieShivDebug = true;
// uncomment above if you want to test
(function(exports) {
=======
(function (exports) {
>>>>>>>
(function (exports) {
<<<<<<<
=======
>>>>>>>
<<<<<<<
}
=======
}
>>>>>>>
} |
<<<<<<<
//don't close on clicking the bubble
if (!$(e.target).hasClass(ns+'-bubble')) {
$b.toggleClass('active').find('.'+ns+'-bubble').fadeToggle();
=======
// don't close on clicking the bubble
if (!$(event.target).hasClass(ns+'-bubble')) {
// Call the callback, if set
if (typeof plugin.settings.onbeforeshow_callback === 'function') {
plugin.settings.onbeforeshow_callback(this);
}
$b.toggleClass('active');
var $current_bubble = $b.find('.'+ns+'-bubble');
// Forces hiding other bubbles
if (plugin.settings.close_all_but_this) {
$('.'+ns+'-bubble').not($current_bubble).fadeOut();
}
$current_bubble.fadeToggle();
>>>>>>>
// don't close on clicking the bubble
if (!$(e.target).hasClass(ns+'-bubble')) {
// Call the callback, if set
if (typeof plugin.settings.onbeforeshow_callback === 'function') {
plugin.settings.onbeforeshow_callback(this);
}
$b.toggleClass('active');
var $current_bubble = $b.find('.'+ns+'-bubble');
// Forces hiding other bubbles
if (plugin.settings.close_all_but_this) {
$('.'+ns+'-bubble').not($current_bubble).fadeOut();
}
$current_bubble.fadeToggle();
<<<<<<<
if (typeof plugin.settings.onchange_callback == "function") {
plugin.settings.onchange_callback(col);
=======
if (typeof plugin.settings.onchange_callback === 'function') {
plugin.settings.onchange_callback( this );
>>>>>>>
if (typeof plugin.settings.onchange_callback === "function") {
plugin.settings.onchange_callback(col); |
<<<<<<<
$( '[name="'+$button.attr('data-target')+'"]' ).val( name );
// Call the callback, if set
if (typeof plugin.settings.onchange_callback == "function") {
plugin.settings.onchange_callback();
}
=======
if( plugin.settings.set_background == false ) {
$('[name="' + $button.attr('data-target') + '"]').val(name);
} else {
$('[name="' + $button.attr('data-target') + '"]').css({'background-color' : col});
}
>>>>>>>
// Call the callback, if set
if (typeof plugin.settings.onchange_callback == "function") {
plugin.settings.onchange_callback();
}
if( plugin.settings.set_background == false ) {
$('[name="' + $button.attr('data-target') + '"]').val(name);
} else {
$('[name="' + $button.attr('data-target') + '"]').css({'background-color' : col});
} |
<<<<<<<
filter: createIncludedActions(),
debug: true
=======
filter: includeAction([
CHANGE_DIMENSIONS,
DRAW_CELL,
SET_DRAWING,
SET_CELL_SIZE,
SET_RESET_GRID,
NEW_PROJECT
]),
debug: true,
ignoreInitialState: true
>>>>>>>
filter: createIncludedActions(),
debug: true,
ignoreInitialState: true
<<<<<<<
filter: createIncludedActions(),
debug: false
=======
filter: includeAction([
CHANGE_DIMENSIONS,
DRAW_CELL,
SET_DRAWING,
SET_CELL_SIZE,
SET_RESET_GRID,
NEW_PROJECT
]),
debug: false,
ignoreInitialState: true
>>>>>>>
filter: createIncludedActions(),
debug: false,
ignoreInitialState: true |
<<<<<<<
ipcMain.on('show-export-dialog', (event, gqlSchema, gqlResolvers, sqlScripts, env) => {
showExportDialog(event, gqlSchema, gqlResolvers, sqlScripts, env);
=======
ipc.on('show-export-dialog', (event, gqlSchema, gqlResolvers, sqlScripts, env, queries) => {
console.log('show-export-dialog => ', queries);
showExportDialog(event, gqlSchema, gqlResolvers, sqlScripts, env, queries);
>>>>>>>
ipcMain.on('show-export-dialog', (event, gqlSchema, gqlResolvers, sqlScripts, env, queries) => {
console.log('show-export-dialog => ', queries);
showExportDialog(event, gqlSchema, gqlResolvers, sqlScripts, env, queries); |
<<<<<<<
this.view.add(name, config.replace(/"/igm,""), property);
=======
if (name === 'More') {
config = config.join(", ");
if (!config) {
return;
}
}
this.view.add(name, config, property);
>>>>>>>
if (name === 'More') {
config = config.join(", ");
if (!config) {
return;
}
}
this.view.add(name, config.replace(/"/igm,""), property); |
<<<<<<<
import { storiesOf } from '@storybook/react';
import { HjelpetekstOver, HjelpetekstUnder, HjelpetekstHoyre, HjelpetekstVenstre } from './src/index';
=======
import { storiesOf } from '@kadira/storybook';
import { JSDokumentasjon } from './../../dokumentasjon';
import readme from './README.md';
import pkg from './package.json';
import { HjelpetekstOver, HjelpetekstUnder, HjelpetekstHoyre, HjelpetekstVenstre } from './src/hjelpetekst';
>>>>>>>
import { storiesOf } from '@storybook/react';
import { JSDokumentasjon } from './../../dokumentasjon';
import readme from './README.md';
import pkg from './package.json';
import { HjelpetekstOver, HjelpetekstUnder, HjelpetekstHoyre, HjelpetekstVenstre } from './src/hjelpetekst'; |
<<<<<<<
import Ikon from 'nav-frontend-ikoner-assets'; // eslint-disable-line import/extensions
import { PropTypes as PT } from 'prop-types';
import { storiesOf } from '@kadira/storybook';
=======
import { storiesOf } from '@storybook/react';
>>>>>>>
import Ikon from 'nav-frontend-ikoner-assets'; // eslint-disable-line import/extensions
import { PropTypes as PT } from 'prop-types';
import { storiesOf } from '@storybook/react';
<<<<<<<
<HjelpetekstOver anchor={MyAnchor}>
=======
<HjelpetekstOver id="over">
>>>>>>>
<HjelpetekstOver id="over" anchor={MyAnchor}> |
<<<<<<<
import { storiesOf } from '@storybook/react';
import { Readme } from './../../dokumentasjon';
import readme from './README.md';
=======
import { storiesOf } from '@kadira/storybook';
>>>>>>>
import { storiesOf } from '@storybook/react'; |
<<<<<<<
function register(componentPath, tagName, cache, hasRegisterCache) {
=======
function register(componentPath, tagName, cache) {
// 用于 wcc 编译器使用
if (window.__webview_engine_version__ !== 0.02) window.__webview_engine_version__ = 0.02
>>>>>>>
function register(componentPath, tagName, cache, hasRegisterCache) {
// 用于 wcc 编译器使用
if (window.__webview_engine_version__ !== 0.02) window.__webview_engine_version__ = 0.02 |
<<<<<<<
* @param {HTMLElement} contentEl The DIV.contentText element of the line
* content to apply the annotation to using annotateRange.
* @param {HTMLElement} lineNumberEl The TD element of the line number to
* apply the annotation to using annotateLineNumber.
=======
*
* @param {HTMLElement} el The DIV.contentText element to apply the
* annotation to using annotateRange.
>>>>>>>
*
* @param {HTMLElement} contentEl The DIV.contentText element of the line
* content to apply the annotation to using annotateRange.
* @param {HTMLElement} lineNumberEl The TD element of the line number to
* apply the annotation to using annotateLineNumber.
<<<<<<<
* Method to add annotations to a content line.
* @param {number} offset The char offset where the update starts.
* @param {number} length The number of chars that the update covers.
* @param {string} cssClass The name of a CSS class created using Gerrit.css.
* @param {string} side The side of the update. ('left' or 'right')
=======
* Method to add annotations to a line.
*
* @param {Number} start The line number where the update starts.
* @param {Number} end The line number where the update ends.
* @param {String} cssClass The name of a CSS class created using Gerrit.css.
* @param {String} side The side of the update. ('left' or 'right')
>>>>>>>
* Method to add annotations to a content line.
*
* @param {number} offset The char offset where the update starts.
* @param {number} length The number of chars that the update covers.
* @param {string} cssClass The name of a CSS class created using Gerrit.css.
* @param {string} side The side of the update. ('left' or 'right') |
<<<<<<<
.controller('User', function($rootScope, $scope, $timeout, $modal, userService, wordsCountService, charactersCountService) {
=======
.controller('User', function($rootScope, $timeout, $modal, userService, documentsService, wordsCountService, charactersCountService) {
>>>>>>>
.controller('User', function($rootScope, $timeout, $modal, userService, documentsService, wordsCountService, charactersCountService) {
<<<<<<<
function setTabSize() {
$scope.tabsize = vm.profile.tabSize;
$rootScope.editor.session.setTabSize($scope.tabsize);
return false;
}
=======
function pasteDetected() {
// only change if the title if still set to the default
if (documentsService.getCurrentDocumentTitle() == 'Untitled Document.md') {
// wait for preview to process Markdown, but only run once then destroy
var destroyListener = $rootScope.$on('preview.updated', function() {
setDocumentTitleToFirstHeader();
destroyListener();
});
}
}
function setDocumentTitleToFirstHeader() {
// set the document's name to the first header if there is one
try {
documentsService.setCurrentDocumentTitle(angular.element(document).find('#preview').find('h1')[0].textContent + ".md");
}
// don't do anything if there's no header
catch(err) {}
return;
}
>>>>>>>
function setTabSize() {
$scope.tabsize = vm.profile.tabSize;
$rootScope.editor.session.setTabSize($scope.tabsize);
return false;
}
function pasteDetected() {
// only change if the title if still set to the default
if (documentsService.getCurrentDocumentTitle() == 'Untitled Document.md') {
// wait for preview to process Markdown, but only run once then destroy
var destroyListener = $rootScope.$on('preview.updated', function() {
setDocumentTitleToFirstHeader();
destroyListener();
});
}
}
function setDocumentTitleToFirstHeader() {
// set the document's name to the first header if there is one
try {
documentsService.setCurrentDocumentTitle(angular.element(document).find('#preview').find('h1')[0].textContent + ".md");
}
// don't do anything if there's no header
catch(err) {}
return;
} |
<<<<<<<
var bodyScrollLock = require('body-scroll-lock');
=======
require('brace/keybinding/vim')
require('brace/keybinding/emacs')
>>>>>>>
var bodyScrollLock = require('body-scroll-lock');
require('brace/keybinding/vim')
require('brace/keybinding/emacs') |
<<<<<<<
// if splitOn was not passed in, construct it from the delimiter to allow pasting universally
if (!self.settings.splitOn && self.settings.delimiter) {
var delimiterEscaped = self.settings.delimiter.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
self.settings.splitOn = new RegExp('\\s*' + delimiterEscaped + '+\\s*');
}
if (self.$input.attr('autocorrect')) {
$control_input.attr('autocorrect', self.$input.attr('autocorrect'));
=======
if ($input.attr('autocorrect')) {
$control_input.attr('autocorrect', $input.attr('autocorrect'));
>>>>>>>
// if splitOn was not passed in, construct it from the delimiter to allow pasting universally
if (!self.settings.splitOn && self.settings.delimiter) {
var delimiterEscaped = self.settings.delimiter.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
self.settings.splitOn = new RegExp('\\s*' + delimiterEscaped + '+\\s*');
}
if ($input.attr('autocorrect')) {
$control_input.attr('autocorrect', $input.attr('autocorrect'));
<<<<<<<
=======
if (!self.canCreate(input)) return false;
self.lock();
>>>>>>>
if (!self.canCreate(input)) return false;
self.lock(); |
<<<<<<<
'initialize' : 'onInitialize',
'change' : 'onChange',
'item_add' : 'onItemAdd',
'item_remove' : 'onItemRemove',
'clear' : 'onClear',
'option_add' : 'onOptionAdd',
'option_remove' : 'onOptionRemove',
'option_clear' : 'onOptionClear',
'optgroup_add' : 'onOptionGroupAdd',
'optgroup_remove' : 'onOptionGroupRemove',
'optgroup_clear' : 'onOptionGroupClear',
'dropdown_open' : 'onDropdownOpen',
'dropdown_close' : 'onDropdownClose',
'type' : 'onType',
'load' : 'onLoad'
=======
'initialize' : 'onInitialize',
'change' : 'onChange',
'item_add' : 'onItemAdd',
'item_remove' : 'onItemRemove',
'clear' : 'onClear',
'option_add' : 'onOptionAdd',
'option_remove' : 'onOptionRemove',
'option_clear' : 'onOptionClear',
'dropdown_open' : 'onDropdownOpen',
'dropdown_close' : 'onDropdownClose',
'type' : 'onType',
'focus' : 'onFocus',
'blur' : 'onBlur'
>>>>>>>
'initialize' : 'onInitialize',
'change' : 'onChange',
'item_add' : 'onItemAdd',
'item_remove' : 'onItemRemove',
'clear' : 'onClear',
'option_add' : 'onOptionAdd',
'option_remove' : 'onOptionRemove',
'option_clear' : 'onOptionClear',
'optgroup_add' : 'onOptionGroupAdd',
'optgroup_remove' : 'onOptionGroupRemove',
'optgroup_clear' : 'onOptionGroupClear',
'dropdown_open' : 'onDropdownOpen',
'dropdown_close' : 'onDropdownClose',
'type' : 'onType',
'load' : 'onLoad',
'focus' : 'onFocus',
'blur' : 'onBlur'
<<<<<<<
// necessary to prevent IE closing the dropdown when the scrollbar is clicked
if (!self.ignoreBlur && document.activeElement === self.$dropdown_content[0]) {
self.ignoreBlur = true;
self.onFocus(e);
return;
}
if (self.settings.create && self.settings.createOnBlur) {
self.createItem(null, false);
}
=======
if (wasFocused) self.trigger('blur');
>>>>>>>
// necessary to prevent IE closing the dropdown when the scrollbar is clicked
if (!self.ignoreBlur && document.activeElement === self.$dropdown_content[0]) {
self.ignoreBlur = true;
self.onFocus(e);
return;
}
if (self.settings.create && self.settings.createOnBlur) {
self.createItem(null, false);
}
if (wasFocused) self.trigger('blur'); |
<<<<<<<
@observable error
=======
@observable localInstallNoticeDismissed = localData.get('local-install-notice-dimissed')
>>>>>>>
@observable localInstallNoticeDismissed = localData.get('local-install-notice-dimissed')
@observable error
<<<<<<<
@action setError (err) {
this.error = err
}
=======
@action setLocalInstallNoticeDismissed (isDismissed) {
this.localInstallNoticeDismissed = isDismissed
localData.set('local-install-notice-dimissed', isDismissed)
}
>>>>>>>
@action setLocalInstallNoticeDismissed (isDismissed) {
this.localInstallNoticeDismissed = isDismissed
localData.set('local-install-notice-dimissed', isDismissed)
}
@action setError (err) {
this.error = err
} |
<<<<<<<
const run = (options) => () => {
const args = ['--run-project', options.project]
=======
const processRunOptions = (options = {}) => {
const args = ['--project', options.project]
>>>>>>>
const processRunOptions = (options = {}) => {
const args = ['--run-project', options.project] |
<<<<<<<
Options:
-v, --version prints Cypress version
-h, --help output usage information
=======
Usage: cypress <command> [options]
Options:
-v, --version prints Cypress version
-h, --help output usage information
Commands:
>>>>>>>
Usage: cypress <command> [options]
Options:
-v, --version prints Cypress version
-h, --help output usage information |
<<<<<<<
instance.setAutoScrolling(false)
instance.end()
=======
instance.temporarilySetAutoScrolling(false)
instance.stop()
>>>>>>>
instance.temporarilySetAutoScrolling(false)
instance.end() |
<<<<<<<
if (webpackOptions.devtool !== false) {
webpackOptions.devtool = 'inline-source-map'
}
log(`input: ${filePath}`)
log(`output: ${outputPath}`)
=======
debug(`input: ${filePath}`)
debug(`output: ${outputPath}`)
>>>>>>>
if (webpackOptions.devtool !== false) {
webpackOptions.devtool = 'inline-source-map'
}
debug(`input: ${filePath}`)
debug(`output: ${outputPath}`) |
<<<<<<<
=======
if (opts.callback) {
opts.callback();
}
>>>>>>>
if (opts.callback) {
opts.callback();
} |
<<<<<<<
import { sanitizeHtml } from './../../utils/dom/code-sampling.utils';
import dfs from 'depth-first';
=======
>>>>>>>
import dfs from 'depth-first'; |
<<<<<<<
rule: /^1((3[\d])|(4[5,6,9])|(5[0-3,5-9])|(6[5,7])|(7[0-8])|(8[1,2,3,5-8])|(9[1,8,9]))\d{8}$/,
// rule: /^[1](([3][0-9])|([4][5-9])|([5][0-3,5-9])|([6][5,6])|([7][0-8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$/,
=======
rule: /^(1(3[\d]|4[5|6|9]|5[0|1|2|3|5|6|7|8|9]|6[5|7]|7[0|1|2|3|4|5|6|7|8]||8[1|2|3|5|6|7|8]|9[1|8|9])\d{8})$/,
>>>>>>>
rule: /^1((3[\d])|(4[5,6,9])|(5[0-3,5-9])|(6[5,7])|(7[0-8])|(8[1,2,3,5-8])|(9[1,8,9]))\d{8}$/, |
<<<<<<<
<BpkModal
id="my-modal"
isOpen={this.state.isOpen}
onClose={this.onClose}
wide={this.state.wide}
renderTarget={this.theamableModalTarget}
{...rest}
>
=======
<BpkModal id="my-modal" isOpen={this.state.isOpen} onClose={this.onClose} wide={this.state.hideTitle} {...rest}>
>>>>>>>
<BpkModal
id="my-modal"
isOpen={this.state.isOpen}
onClose={this.onClose}
wide={this.state.hideTitle}
renderTarget={this.theamableModalTarget}
{...rest}
> |
<<<<<<<
},
{
name: '"file" param with vendor specific form-data "consumes"',
valid: true,
file: 'file-vendor-specific-consumes-formdata.yaml'
},
{
name: '"file" param with vendor specific urlencoded "consumes"',
valid: true,
file: 'file-vendor-specific-consumes-urlencoded.yaml'
},
{
name: 'required property in input does not exist',
valid: false,
file: 'required-property-not-defined-input.yaml',
error: 'Validation failed. Property \'notExists\' listed as required but does not exist in \'/paths/pets/post/parameters/pet\''
},
{
name: 'required property in definition does not exist',
valid: false,
file: 'required-property-not-defined-definitions.yaml',
error: 'Validation failed. Property \'photoUrls\' listed as required but does not exist in \'/definitions/Pet\''
},
{
name: 'schema declares required properties which are inherited (allOf)',
valid: true,
file: 'inherited-required-properties.yaml'
},
{
name: 'duplicate operation IDs',
valid: false,
file: 'duplicate-operation-ids.yaml',
error: 'Validation failed. Duplicate operation id \'users\''
=======
},
{
name: 'array response body without items',
valid: false,
file: 'array-response-body-no-items.yaml',
error: 'Validation failed. /paths/users/get/responses/200/schema is an array, so it must include an \"items\" schema'
>>>>>>>
},
{
name: '"file" param with vendor specific form-data "consumes"',
valid: true,
file: 'file-vendor-specific-consumes-formdata.yaml'
},
{
name: '"file" param with vendor specific urlencoded "consumes"',
valid: true,
file: 'file-vendor-specific-consumes-urlencoded.yaml'
},
{
name: 'required property in input does not exist',
valid: false,
file: 'required-property-not-defined-input.yaml',
error: 'Validation failed. Property \'notExists\' listed as required but does not exist in \'/paths/pets/post/parameters/pet\''
},
{
name: 'required property in definition does not exist',
valid: false,
file: 'required-property-not-defined-definitions.yaml',
error: 'Validation failed. Property \'photoUrls\' listed as required but does not exist in \'/definitions/Pet\''
},
{
name: 'schema declares required properties which are inherited (allOf)',
valid: true,
file: 'inherited-required-properties.yaml'
},
{
name: 'duplicate operation IDs',
valid: false,
file: 'duplicate-operation-ids.yaml',
error: 'Validation failed. Duplicate operation id \'users\''
},
{
name: 'array response body without items',
valid: false,
file: 'array-response-body-no-items.yaml',
error: 'Validation failed. /paths/users/get/responses/200/schema is an array, so it must include an \"items\" schema' |
<<<<<<<
=======
/** !
* Swagger Parser v4.0.0-beta.2
*
* @link https://github.com/BigstickCarpet/swagger-parser
* @license MIT
*/
>>>>>>>
<<<<<<<
.catch(function (err) {
return maybe(callback, Promise.reject(err));
=======
.catch(function(err) {
return maybe(args.callback, Promise.reject(err));
>>>>>>>
.catch(function (err) {
return maybe(args.callback, Promise.reject(err));
<<<<<<<
SwaggerParser.prototype.validate = function (api, options, callback) {
if (typeof options === 'function') {
callback = options;
options = undefined;
}
options = new Options(options);
=======
SwaggerParser.prototype.validate = function(api, options, callback) {
>>>>>>>
SwaggerParser.prototype.validate = function (api, options, callback) {
<<<<<<<
return this.dereference(api, options)
.then(function () {
=======
return this.dereference(args.path, args.api, args.options)
.then(function() {
>>>>>>>
return this.dereference(args.path, args.api, args.options)
.then(function () {
<<<<<<<
.catch(function (err) {
return maybe(callback, Promise.reject(err));
=======
.catch(function(err) {
return maybe(args.callback, Promise.reject(err));
>>>>>>>
.catch(function (err) {
return maybe(args.callback, Promise.reject(err)); |
<<<<<<<
try {
const params = req.body;
const documentUuid = uuid();
const period = await Fiscal.lookupFiscalYearByDate(params.date);
const periodId = period.id;
const transaction = db.transaction();
const document = {
uuid : documentUuid,
date : new Date(params.date),
user : req.session.user.id,
depot_uuid : params.depot_uuid,
flux_id : params.flux_id,
description : params.description,
};
// prepare lot insertion query
const createLotQuery = 'INSERT INTO lot SET ?';
// prepare movement insertion query
const createMovementQuery = 'INSERT INTO stock_movement SET ?';
// aggregate data for CMM calculation
const recomputeCMMDataQuery = `CALL computeStockQuantityByLotUuid(?, ?, ?);`;
params.lots.forEach(lot => {
// parse the expiration date
const date = new Date(lot.expiration_date);
// the lot object to insert
const createLotObject = {
uuid : db.bid(uuid()),
label : lot.label,
initial_quantity : lot.quantity,
quantity : lot.quantity,
unit_cost : lot.unit_cost,
expiration_date : date,
inventory_uuid : db.bid(lot.inventory_uuid),
origin_uuid : db.bid(lot.origin_uuid),
delay : 0,
};
// the movement object to insert
const createMovementObject = {
uuid : db.bid(uuid()),
lot_uuid : createLotObject.uuid,
depot_uuid : db.bid(document.depot_uuid),
document_uuid : db.bid(documentUuid),
=======
try {
const params = req.body;
const documentUuid = uuid();
const period = await Fiscal.lookupFiscalYearByDate(params.date);
const periodId = period.id;
const transaction = db.transaction();
const transaction2 = db.transaction();
const document = {
uuid : documentUuid,
date : new Date(params.date),
user : req.session.user.id,
depot_uuid : params.depot_uuid,
flux_id : params.flux_id,
description : params.description,
};
// prepare lot insertion query
const createLotQuery = 'INSERT INTO lot SET ?';
// prepare movement insertion query
const createMovementQuery = 'INSERT INTO stock_movement SET ?';
// aggregate data for CMM calculation
const recomputeCMMDataQuery = `CALL computeStockQuantityByLotUuid(?, ?, ?);`;
params.lots.forEach(lot => {
// parse the expiration date
const date = new Date(lot.expiration_date);
// the lot object to insert
const createLotObject = {
uuid : db.bid(uuid()),
label : lot.label,
initial_quantity : lot.quantity,
quantity : lot.quantity,
unit_cost : lot.unit_cost,
expiration_date : date,
inventory_uuid : db.bid(lot.inventory_uuid),
origin_uuid : db.bid(lot.origin_uuid),
delay : 0,
};
// the movement object to insert
const createMovementObject = {
uuid : db.bid(uuid()),
lot_uuid : createLotObject.uuid,
depot_uuid : db.bid(document.depot_uuid),
document_uuid : db.bid(documentUuid),
>>>>>>>
try {
const params = req.body;
const documentUuid = uuid();
const period = await Fiscal.lookupFiscalYearByDate(params.date);
const periodId = period.id;
const transaction = db.transaction();
const document = {
uuid : documentUuid,
date : new Date(params.date),
user : req.session.user.id,
depot_uuid : params.depot_uuid,
flux_id : params.flux_id,
description : params.description,
};
// prepare lot insertion query
const createLotQuery = 'INSERT INTO lot SET ?';
// prepare movement insertion query
const createMovementQuery = 'INSERT INTO stock_movement SET ?';
params.lots.forEach(lot => {
// parse the expiration date
const date = new Date(lot.expiration_date);
// the lot object to insert
const createLotObject = {
uuid : db.bid(uuid()),
label : lot.label,
initial_quantity : lot.quantity,
quantity : lot.quantity,
unit_cost : lot.unit_cost,
expiration_date : date,
inventory_uuid : db.bid(lot.inventory_uuid),
origin_uuid : db.bid(lot.origin_uuid),
delay : 0,
};
// the movement object to insert
const createMovementObject = {
uuid : db.bid(uuid()),
lot_uuid : createLotObject.uuid,
depot_uuid : db.bid(document.depot_uuid),
document_uuid : db.bid(documentUuid),
<<<<<<<
await updateQuantityInStockAfterMovement(inventoryUuids, integration.date, params.movement.depot_uuid);
=======
await transaction2.execute();
>>>>>>>
// update the quantity in stock as needed
await updateQuantityInStockAfterMovement(inventoryUuids, integration.date, params.movement.depot_uuid);
<<<<<<<
const result = await transaction.execute();
// update the quantity in stock as needed
await updateQuantityInStockAfterMovement(inventoryUuids, document.date, parameters.depot_uuid);
return result;
=======
const result = await transaction.execute();
await transaction2.execute();
return result;
>>>>>>>
const result = await transaction.execute();
// update the quantity in stock as needed
await updateQuantityInStockAfterMovement(inventoryUuids, document.date, parameters.depot_uuid);
return result;
<<<<<<<
async function depotMovement(document, params) {
=======
async function depotMovement(document, params) {
>>>>>>>
async function depotMovement(document, params) {
<<<<<<<
// gather inventory uuids for later quantity in stock calculation updates
const inventoryUuids = parameters.lots.map(lot => lot.inventory_uuid);
const result = await transaction.execute();
// update the quantity in stock as needed
await updateQuantityInStockAfterMovement(inventoryUuids, document.date, depotUuid);
return result;
=======
const result = await transaction.execute();
await transaction2.execute();
return result;
>>>>>>>
// gather inventory uuids for later quantity in stock calculation updates
const inventoryUuids = parameters.lots.map(lot => lot.inventory_uuid);
const result = await transaction.execute();
// update the quantity in stock as needed
await updateQuantityInStockAfterMovement(inventoryUuids, document.date, depotUuid);
return result; |
<<<<<<<
type: 'transfer',
toAccount: 'Test Debtor Accounts 1',
fromAccount: 'Test Inventory Accounts',
=======
toAccount: 'Test Debtor Group Account',
fromAccount: 'Updated inventory accounts',
>>>>>>>
type: 'transfer',
toAccount: 'Test Debtor Group Account',
fromAccount: 'Updated inventory accounts', |
<<<<<<<
UsersController.$inject = ['$state', 'UserService', 'NotifyService', 'ModalService', 'DropdownBehaviorService'];
=======
UsersController.$inject = ['$state', 'UserService', 'NotifyService', 'ModalService', 'uiGridConstants'];
>>>>>>>
UsersController.$inject = ['$state', 'UserService', 'NotifyService', 'ModalService', 'DropdownBehaviorService', 'uiGridConstants'];
<<<<<<<
function UsersController($state, Users, Notify, Modal, DropdownBehavior) {
=======
function UsersController($state, Users, Notify, Modal, uiGridConstants) {
>>>>>>>
function UsersController($state, Users, Notify, Modal, DropdownBehavior, uiGridConstants) {
<<<<<<<
//caret behavior
vm.dropdownBehavior = DropdownBehavior.setPosition;
=======
vm.depotManagement = depotManagement;
>>>>>>>
//caret behavior
vm.dropdownBehavior = DropdownBehavior.setPosition;
vm.depotManagement = depotManagement; |
<<<<<<<
var creditorGroups = require('../controllers/finance/creditorGroups');
=======
var functions = require('../controllers/admin/functions');
var grades = require('../controllers/admin/grades');
>>>>>>>
var functions = require('../controllers/admin/functions');
var grades = require('../controllers/admin/grades');
var creditorGroups = require('../controllers/finance/creditorGroups');
<<<<<<<
/** Creditor Groups API */
app.post('/creditor_groups', creditorGroups.create);
app.get('/creditor_groups', creditorGroups.list);
app.get('/creditor_groups/:uuid', creditorGroups.detail);
=======
/** functions api */
app.get('/functions', functions.list);
app.get('/functions/:id', functions.detail);
app.post('/functions', functions.create);
app.put('/functions/:id', functions.update);
app.delete('/functions/:id', functions.delete);
/** Grades api */
app.get('/grades', grades.list);
app.get('/grades/:uuid', grades.detail);
app.post('/grades', grades.create);
app.put('/grades/:uuid', grades.update);
app.delete('/grades/:uuid', grades.delete);
>>>>>>>
/** functions api */
app.get('/functions', functions.list);
app.get('/functions/:id', functions.detail);
app.post('/functions', functions.create);
app.put('/functions/:id', functions.update);
app.delete('/functions/:id', functions.delete);
/** Grades api */
app.get('/grades', grades.list);
app.get('/grades/:uuid', grades.detail);
app.post('/grades', grades.create);
app.put('/grades/:uuid', grades.update);
app.delete('/grades/:uuid', grades.delete);
/** Creditor Groups API */
app.post('/creditor_groups', creditorGroups.create);
app.get('/creditor_groups', creditorGroups.list);
app.get('/creditor_groups/:uuid', creditorGroups.detail); |
<<<<<<<
// transfer type
service.transferType = [
{ id: 0, text: 'VOUCHERS.SIMPLE.GENERIC_INCOME', incomeExpense: 'income', prefix: 'REC. GEN' },
{ id: 1, text: 'VOUCHERS.SIMPLE.CASH_PAYMENT', incomeExpense: 'income', prefix: 'CASH' },
{ id: 2, text: 'VOUCHERS.SIMPLE.CONVENTION_PAYMENT', incomeExpense: 'income', prefix: 'CONV' },
{ id: 3, text: 'VOUCHERS.SIMPLE.SUPPORT_INCOME', incomeExpense: 'income', prefix: 'PEC' },
{ id: 4, text: 'VOUCHERS.SIMPLE.TRANSFER', incomeExpense: 'income', prefix: 'TRANSF' },
{ id: 5, text: 'VOUCHERS.SIMPLE.GENERIC_EXPENSE', incomeExpense: 'expense', prefix: 'DEP. GEN' },
{ id: 6, text: 'VOUCHERS.SIMPLE.SALARY_PAYMENT', incomeExpense: 'expense', prefix: 'SALAIRE' },
{ id: 7, text: 'VOUCHERS.SIMPLE.CASH_RETURN', incomeExpense: 'expense', prefix: 'PAYBACK' },
{ id: 8, text: 'VOUCHERS.SIMPLE.PURCHASES', incomeExpense: 'expense', prefix: 'ACHAT' }
];
service.url = '/vouchers/';
=======
>>>>>>>
service.url = '/vouchers/'; |
<<<<<<<
depot : StockDepotFilters,
=======
requisition : StockRequisitionFilters,
>>>>>>>
depot : StockDepotFilters,
requisition : StockRequisitionFilters, |
<<<<<<<
yesNoRadios : require('./bhYesNoRadios'),
findInvoice : require('./bhFindInvoice'),
=======
yesNoRadios : require('./bhYesNoRadios'),
payrollPeriodSelect : require('./bhPayrollPeriodSelect'),
>>>>>>>
yesNoRadios : require('./bhYesNoRadios'),
findInvoice : require('./bhFindInvoice'),
payrollPeriodSelect : require('./bhPayrollPeriodSelect'), |
<<<<<<<
app.get('/reports/finance/unbalanced_invoice_payments', unbalancedInvoicePayments.document);
=======
app.get('/reports/finance/income_expense_by_month', financeReports.income_expense_by_month.document);
>>>>>>>
app.get('/reports/finance/unbalanced_invoice_payments', unbalancedInvoicePayments.document);
app.get('/reports/finance/income_expense_by_month', financeReports.income_expense_by_month.document); |
<<<<<<<
const fs = require('mz/fs');
=======
const fs = require('fs').promises;
const exec = util.promisify(require('child_process').exec);
>>>>>>>
const fs = require('fs').promises; |
<<<<<<<
await FU.typeahead('AdmitCtrl.visit.diagnosis', diagnosis);
=======
components.diagnosisSelect.set(diagnosis);
>>>>>>>
await components.diagnosisSelect.set(diagnosis); |
<<<<<<<
var donors = require('../controllers/donors');
=======
var referenceGroup = require('../controllers/finance/referenceGroup');
var sectionResultats = require('../controllers/finance/sectionResultat');
var sectionBilans = require('../controllers/finance/sectionBilan');
>>>>>>>
var donors = require('../controllers/donors');
var referenceGroup = require('../controllers/finance/referenceGroup');
var sectionResultats = require('../controllers/finance/sectionResultat');
var sectionBilans = require('../controllers/finance/sectionBilan'); |
<<<<<<<
var vouchers = require('../controllers/finance/vouchers');
=======
var suppliers = require('../controllers/admin/suppliers');
>>>>>>>
var vouchers = require('../controllers/finance/vouchers');
var suppliers = require('../controllers/admin/suppliers');
<<<<<<<
/** voucher api endpoint */
app.get('/vouchers', vouchers.list);
app.get('/vouchers/:uuid', vouchers.detail);
app.post('/vouchers', vouchers.create);
=======
/** Suppliers api */
app.get('/suppliers', suppliers.list);
app.get('/suppliers/:uuid', suppliers.detail);
app.post('/suppliers', suppliers.create);
app.put('/suppliers/:uuid', suppliers.update);
>>>>>>>
/** voucher api endpoint */
app.get('/vouchers', vouchers.list);
app.get('/vouchers/:uuid', vouchers.detail);
app.post('/vouchers', vouchers.create);
/** Suppliers api */
app.get('/suppliers', suppliers.list);
app.get('/suppliers/:uuid', suppliers.detail);
app.post('/suppliers', suppliers.create);
app.put('/suppliers/:uuid', suppliers.update); |
<<<<<<<
// bind methods to the prototype
Api.prototype.create = create;
Api.prototype.read = read;
Api.prototype.update = update;
Api.prototype.delete = remove;
Api.prototype.search = search;
Api.prototype.$http = $http;
Api.prototype.util = util;
// bind functions directly for ease of calling in services which need to
// modify the functions before executing them.
Api.create = create;
Api.read = read;
Api.update = update;
Api.delete = remove;
Api.search = search;
=======
// basic API methods
this.create = create;
this.read = read;
this.update = update;
this.delete = remove;
this.report = report;
>>>>>>>
// bind methods to the prototype
Api.prototype.create = create;
Api.prototype.read = read;
Api.prototype.update = update;
Api.prototype.delete = remove;
Api.prototype.search = search;
Api.prototype.$http = $http;
Api.prototype.util = util;
Api.prototype.report = report;
// bind functions directly for ease of calling in services which need to
// modify the functions before executing them.
Api.create = create;
Api.read = read;
Api.update = update;
Api.delete = remove;
Api.search = search;
Api.report = report;
<<<<<<<
/**
* @method search
*
* @description
* Sends an HTTP GET request to the url "/route/search" with properly formatted
* query strings to query the database. The expected response is a `200 OK`
* HTTP status code.
*
* @param {Object} parameters - the query conditions to filter data in the database
* @returns {Promise} - the promise with the identifier from the database
*
* @example
* // GET "/route/search" with formatted query strings
* service.search({ text : "Hello World!" }).then(function (data) {
* // data an object containing the identifier. Usually "id" or "uuid"
* });
*/
function search(parameters) {
// append 'search' to the base url
var target = this.url.concat('search');
// return the query to the controller
return $http.get(target, { params : parameters })
.then(util.unwrapHttpResponse);
}
return Api;
=======
/**
* @method reports
*
* @description
* Sends an HTTP GET request to the url "/route/reports/:id"
* to get a document as a report.
*
* @param {String} param - A parameter for the URL route.
* @param {String} filetype - the report file type (pdf, json, html)
* @returns {Promise} - the promise
*/
function report(param, filetype) {
// append the id to the base url
var target = this.url.concat('reports/', param);
// filetype setup
var responseType = filetype === 'pdf' ? 'arraybuffer' : null;
var params = { renderer: filetype };
// send the GET request
return this.$http.get(target, {
params: params,
responseType: responseType
})
.then(util.unwrapHttpResponse);
}
>>>>>>>
/**
* @method search
*
* @description
* Sends an HTTP GET request to the url "/route/search" with properly formatted
* query strings to query the database. The expected response is a `200 OK`
* HTTP status code.
*
* @param {Object} parameters - the query conditions to filter data in the database
* @returns {Promise} - the promise with the identifier from the database
*
* @example
* // GET "/route/search" with formatted query strings
* service.search({ text : "Hello World!" }).then(function (data) {
* // data an object containing the identifier. Usually "id" or "uuid"
* });
*/
function search(parameters) {
// append 'search' to the base url
var target = this.url.concat('search');
// return the query to the controller
return $http.get(target, { params : parameters })
.then(util.unwrapHttpResponse);
}
/**
* @method reports
*
* @description
* Sends an HTTP GET request to the url "/route/reports/:id"
* to get a document as a report.
*
* @param {String} param - A parameter for the URL route.
* @param {String} filetype - the report file type (pdf, json, html)
* @returns {Promise} - the promise
*/
function report(param, filetype) {
// append the id to the base url
var target = this.url.concat('reports/', param);
// filetype setup
var responseType = filetype === 'pdf' ? 'arraybuffer' : null;
var params = { renderer: filetype };
// send the GET request
return this.$http.get(target, {
params: params,
responseType: responseType
})
.then(util.unwrapHttpResponse);
}
return Api; |
<<<<<<<
service.purchase = purchase;
service.patientRegistrations = patientRegistrations;
=======
/** service.patientRegistrations = patientRegistrations; */
>>>>>>>
service.purchase = purchase;
<<<<<<<
// in this case, the options are actually all filters from the ui-grid
function patientRegistrations(options) {
var reportOptions = {
title: 'PATIENT_REG.PATIENT_REGISTRATIONS',
renderer: Receipts.renderers.PDF,
};
options.renderer = Receipts.renderers.PDF;
var reportRequest = Receipts.patientRegistrations(options);
var reportProvider = {
resolve : {
receipt : function reportProvider () { return { promise : reportRequest }; },
options : function optionsProvider() { return reportOptions; },
}
};
var configuration = angular.extend(modalConfiguration, reportProvider);
var instance = Modal.open(configuration);
return instance.result;
}
function purchase(uuid, notifyCreated) {
var options = {
title : 'PURCHASES.PAGE_TITLE',
createdKey : 'PURCHASES.RECEIPT.SUCCESS',
identifier : 'reference',
renderer : Receipts.renderers.PDF,
notifyCreated : notifyCreated
};
var purchaseRequest = Receipts.purchase(uuid, { renderer: options.renderer });
var reportProvider = {
resolve : {
receipt : function receiptProvider() { return { promise : purchaseRequest}; },
options : function optionsProvider() { return options; },
}
};
var configuration = angular.extend(modalConfiguration, reportProvider);
var instance = Modal.open(configuration);
return instance.result;
}
=======
>>>>>>>
function purchase(uuid, notifyCreated) {
var options = {
title : 'PURCHASES.PAGE_TITLE',
createdKey : 'PURCHASES.RECEIPT.SUCCESS',
identifier : 'reference',
renderer : Receipts.renderers.PDF,
notifyCreated : notifyCreated
};
var purchaseRequest = Receipts.purchase(uuid, { renderer: options.renderer });
var reportProvider = {
resolve : {
receipt : function receiptProvider() { return { promise : purchaseRequest}; },
options : function optionsProvider() { return options; },
}
};
var configuration = angular.extend(modalConfiguration, reportProvider);
var instance = Modal.open(configuration);
return instance.result;
} |
<<<<<<<
const response = {};
=======
>>>>>>>
const response = {}; |
<<<<<<<
if (this.constructor.name === 'Array') {
if (this.length === 0) return `g.V('nonexistent')`;
let type = this[0].constructor.name.charAt(0);
let ids = [];
this.forEach((el) => ids.push(el.id));
console.log('HELLO');
console.log('ids',ids);
return `g.${type}("${ids.join('","')}")`;
}
if (this.id) return `g.V('${this.id}')`;
=======
if (this.id) return `g.${this.constructor.name.charAt(0)}('${this.id}')`;
>>>>>>>
if (this.constructor.name === 'Array') {
if (this.length === 0) return `g.V('nonexistent')`;
let type = this[0].constructor.name.charAt(0);
let ids = [];
this.forEach((el) => ids.push(el.id));
console.log('HELLO');
console.log('ids',ids);
return `g.${type}("${ids.join('","')}")`;
}
if (this.id) return `g.${this.constructor.name.charAt(0)}('${this.id}')`; |
<<<<<<<
it('Should create new edges both ways if bothWays set to true', (done) => {
Knows.create(john, bob, {duration: 5}, true, (err, results) => {
expect(results).to.have.lengthOf(2);
bob.findRelated(Knows, {}, 1, (err, results) => {
expect(results).to.have.lengthOf(1);
expect(results[0].name).to.equal('John');
john.findRelated(Knows, {}, 1, (err, results) => {
expect(results).to.have.lengthOf(1);
expect(results[0].name).to.equal('Bob');
done();
});
});
});
});
it('Should not create new edges both ways if bothWays set to false', (done) => {
Knows.create(john, bob, {duration: 5}, false, (err, results) => {
bob.findRelated(Knows, {}, 1, (err, results) => {
expect(results).to.have.lengthOf(0);
john.findRelated(Knows, {}, 1, (err, results) => {
expect(results).to.have.lengthOf(1);
expect(results[0].name).to.equal('Bob');
done();
});
});
});
});
=======
it('Should not create an edge if correct vertices are not provided', (done) => {
Knows.create(john, undefined, {duration: '123'}, (err, result) => {
expect(result).to.equal(undefined);
done();
});
});
>>>>>>>
it('Should create new edges both ways if bothWays set to true', (done) => {
Knows.create(john, bob, {duration: 5}, true, (err, results) => {
expect(results).to.have.lengthOf(2);
bob.findRelated(Knows, {}, 1, (err, results) => {
expect(results).to.have.lengthOf(1);
expect(results[0].name).to.equal('John');
john.findRelated(Knows, {}, 1, (err, results) => {
expect(results).to.have.lengthOf(1);
expect(results[0].name).to.equal('Bob');
done();
});
});
});
});
it('Should not create new edges both ways if bothWays set to false', (done) => {
Knows.create(john, bob, {duration: 5}, false, (err, results) => {
bob.findRelated(Knows, {}, 1, (err, results) => {
expect(results).to.have.lengthOf(0);
john.findRelated(Knows, {}, 1, (err, results) => {
expect(results).to.have.lengthOf(1);
expect(results[0].name).to.equal('Bob');
done();
});
});
});
});
it('Should not create an edge if correct vertices are not provided', (done) => {
Knows.create(john, undefined, {duration: '123'}, (err, result) => {
expect(result).to.equal(undefined);
done();
});
}); |
<<<<<<<
// get our move event's x & y
var curX = (this.isTouch() ? ev.originalEvent.touches[0].pageX : ev.pageX);
var curY = (this.isTouch() ? ev.originalEvent.touches[0].pageY : ev.pageY);
=======
// Allow/Disallow event bubbling
if ( !this.options.allowEventPropagation ) ev.stopPropagation();
// get our move event's x & y
var curX = (this.isTouch() ? ev.originalEvent.touches[0].pageX : ev.pageX);
var curY = (this.isTouch() ? ev.originalEvent.touches[0].pageY : ev.pageY);
>>>>>>>
// Allow/Disallow event bubbling
if ( !this.options.allowEventPropagation ) ev.stopPropagation();
var curX = (this.isTouch() ? ev.originalEvent.touches[0].pageX : ev.pageX);
var curY = (this.isTouch() ? ev.originalEvent.touches[0].pageY : ev.pageY); |
<<<<<<<
=======
// drop-down menu
import ClickAwayListener from '@material-ui/core/ClickAwayListener';
import Paper from '@material-ui/core/Paper';
import Grow from '@material-ui/core/Grow';
import Popper from '@material-ui/core/Popper';
import MenuItem from '@material-ui/core/MenuItem';
import MenuList from '@material-ui/core/MenuList';
import KeyboardArrowDown from '@material-ui/icons/KeyboardArrowDown';
import KeyboardArrowUp from '@material-ui/icons/KeyboardArrowUp';
>>>>>>>
// drop-down menu
import ClickAwayListener from '@material-ui/core/ClickAwayListener';
import Paper from '@material-ui/core/Paper';
import Grow from '@material-ui/core/Grow';
import Popper from '@material-ui/core/Popper';
import MenuItem from '@material-ui/core/MenuItem';
import MenuList from '@material-ui/core/MenuList';
import KeyboardArrowDown from '@material-ui/icons/KeyboardArrowDown';
import KeyboardArrowUp from '@material-ui/icons/KeyboardArrowUp';
<<<<<<<
<Toolbar disableGutters={!open}>
<IconButton
color="inherit"
aria-label="Open drawer"
onClick={this.handleDrawerOpen}
className={classNames(classes.menuButton, open && classes.hide)}
>
<MenuIcon />
</IconButton>
=======
<Toolbar disableGutters={!open}>
<IconButton
color="inherit"
aria-label="Open drawer"
onClick={this.handleDrawerOpen}
className={classNames(classes.menuButton, open && classes.hide)}
>
<MenuIcon />
</IconButton>
<Grid
container
direction="row"
justify="space-between"
alignItems="center"
color="primary"
>
>>>>>>>
<Toolbar disableGutters={!open}>
<IconButton
color="inherit"
aria-label="Open drawer"
onClick={this.handleDrawerOpen}
className={classNames(classes.menuButton, open && classes.hide)}
>
<MenuIcon />
</IconButton>
<Grid
container
direction="row"
justify="space-between"
alignItems="center"
color="primary"
>
<<<<<<<
<div className="rightSide" >
<div id='k8sContainer'>
<div id='k8simage'></div>
<Graph graph={this.state.graph} options={options} events={this.state.events} />
{type}
</div>
=======
<div className="rightSide">
{viewStyle}
{type}
>>>>>>>
<div className="rightSide" >
<div id='k8sContainer'>
<div id='k8simage'></div>
{viewStyle}
{type}
</div> |
<<<<<<<
$(ts).jqGrid("remapColumns",permutation, true, true);
=======
ui.item.unbind("click");
ui.item.one("click", function() {
$(this).click(clickSort);
return false;
});
$(ts).remapColumns(permutation, true, true);
>>>>>>>
ui.item.unbind("click");
ui.item.one("click", function() {
$(this).click(clickSort);
return false;
});
$(ts).jqGrid("remapColumns",permutation, true, true); |
<<<<<<<
disableClick = true;
$(ts).jqGrid("remapColumns",permutation, true, true);
=======
$(ts).remapColumns(permutation, true, true);
>>>>>>>
$(ts).jqGrid("remapColumns",permutation, true, true); |
<<<<<<<
import React, {
AppRegistry,
Component,
StyleSheet,
Text,
View,
Alert,
Image,
Animated,
Dimensions,
} from 'react-native';
import AppIntro from './AppIntro';
import ViewPager from 'react-native-viewpager';
const windowsWidth = Dimensions.get('window').width;
const windowsHeight = Dimensions.get('window').height;
=======
import React, {Component} from 'react';
import {AppRegistry, StyleSheet, Text, View} from 'react-native';
class Example extends Component {
render() {
return (
<View style={styles.container}>
<Text style={styles.welcome}>
Welcome to React Native!
</Text>
<Text style={styles.instructions}>
To get started, edit index.android.js
</Text>
<Text style={styles.instructions}>
Shake or press menu button for dev menu
</Text>
</View>
);
}
}
>>>>>>>
import React, { Component } from 'react';
import {
AppRegistry,
StyleSheet,
Text,
View,
Alert,
Image,
Dimensions,
} from 'react-native';
import AppIntro from './AppIntro';
const windowsWidth = Dimensions.get('window').width;
const windowsHeight = Dimensions.get('window').height; |
<<<<<<<
=======
var disassembleToString = function(str) {
if (typeof str !== 'string') {
return '';
}
str = disassemble(str);
return str.join('');
};
>>>>>>>
var disassembleToString = function(str) {
if (typeof str !== 'string') {
return '';
}
str = disassemble(str);
return str.join('');
}; |
<<<<<<<
document.addEventListener('touchmove', app.touchmove, false);
document.getElementById('authorize-user-button').addEventListener('click', function(e) { app.authorize(null,null);return false });
=======
document.addEventListener('touchmove', app.touchmove, false);
document.addEventListener('keydown', app.keydown, false);
document.addEventListener('keyup', app.keyup, false);
>>>>>>>
document.addEventListener('touchmove', app.touchmove, false);
document.addEventListener('keydown', app.keydown, false);
document.addEventListener('keyup', app.keyup, false);
document.getElementById('authorize-user-button').addEventListener('click', function(e) { app.authorize(null,null);return false }); |
<<<<<<<
assert(!err, "There must be a session ID after a call to open a database. Received: " + sessionId);
=======
assert(db.server.sessionId, "There must be a session ID after a call to open a database. The current session is: " + db.server.sessionId);
>>>>>>>
assert(db.server.sessionId, "There must be a session ID after a call to open a database. The current session is: " + db.server.sessionId);
<<<<<<<
console.log("Session ID:" + sessionId);
=======
console.log("Session ID: " + db.server.sessionId);
>>>>>>>
console.log("Session ID: " + db.server.sessionId);
<<<<<<<
console.log("Database configuration: " + JSON.stringify(db.configuration));
assert(typeof sessionId !== "undefined");
=======
>>>>>>>
console.log("Database configuration: " + JSON.stringify(db.configuration)); |
<<<<<<<
singleRun = false;
browsers = ['Chrome'];
plugins = [
'testacular-mocha',
'testacular-chrome-launcher',
'testacular-firefox-launcher'
];
=======
singleRun = false;
reporters = ['dots'];
>>>>>>>
singleRun = false;
browsers = ['Chrome'];
reporters = ['dots'];
plugins = [
'testacular-mocha',
'testacular-chrome-launcher',
'testacular-firefox-launcher'
]; |
<<<<<<<
this.mtime = mtime;
this.isUrl = false;
this.doNotCache = false;
};
var Url = function(path) {
this.path = path;
this.isUrl = true;
};
=======
this.mtime = mtime
this.isUrl = false
}
>>>>>>>
this.mtime = mtime
this.isUrl = false
this.doNotCache = false
}
<<<<<<<
if (patterns[idx].nocache) {
file.doNotCache = true;
}
uniqueMap[file.path] = true;
=======
uniqueMap[file.path] = true
>>>>>>>
if (patterns[idx].nocache) {
file.doNotCache = true
}
uniqueMap[file.path] = true |
<<<<<<<
var filePathToUrlPath = function(filePath, basePath, urlRoot) {
=======
var filePathToUrlPath = function (filePath, basePath) {
>>>>>>>
var filePathToUrlPath = function (filePath, basePath, urlRoot) {
<<<<<<<
filePath = filePathToUrlPath(filePath, basePath, urlRoot);
=======
// TODO(vojta): serve these files from within urlRoot as well
filePath = filePathToUrlPath(filePath, basePath)
>>>>>>>
filePath = filePathToUrlPath(filePath, basePath, urlRoot)
<<<<<<<
var mappings = files.served.map(function(file) {
//Windows paths contain backslashes and generate bad IDs if not escaped
var filePath = filePathToUrlPath(file.path, basePath, urlRoot).replace(/\\/g,'\\\\');
=======
var mappings = files.served.map(function (file) {
// Windows paths contain backslashes and generate bad IDs if not escaped
var filePath = filePathToUrlPath(file.path, basePath).replace(/\\/g, '\\\\')
>>>>>>>
var mappings = files.served.map(function (file) {
// Windows paths contain backslashes and generate bad IDs if not escaped
var filePath = filePathToUrlPath(file.path, basePath, urlRoot).replace(/\\/g, '\\\\') |
<<<<<<<
var sinon = require('sinon');
var chai = require('chai');
chai.use(require('sinon-chai'));
var expect = chai.expect
var Karma = require('../../client/karma');
var MockSocket = require('./mocks').Socket;
describe('Karma', function() {
var socket, k, windowNavigator, windowLocation, windowStub, startSpy;
var setTransportTo = function(transportName) {
socket._setTransportNameTo(transportName);
socket.emit('connect');
};
beforeEach(function() {
socket = new MockSocket();
windowNavigator = {};
windowLocation = {search: ''};
windowStub = sinon.stub().returns({});
k = new Karma(socket, {}, windowStub, windowNavigator, windowLocation);
startSpy = sinon.spy(k, 'start');
});
it('should start execution when all files loaded and pass config', function() {
=======
var Karma = require('../../client/karma')
var MockSocket = require('./mocks').Socket
describe('Karma', function () {
var socket, k, spyStart, windowNavigator, windowLocation, spyWindowOpener
var setTransportTo = function (transportName) {
socket._setTransportNameTo(transportName)
socket.emit('connect')
}
beforeEach(function () {
socket = new MockSocket()
windowNavigator = {}
windowLocation = {search: ''}
spyWindowOpener = jasmine.createSpy('window.open').andReturn({})
k = new Karma(socket, {}, spyWindowOpener, windowNavigator, windowLocation)
spyStart = spyOn(k, 'start')
})
it('should start execution when all files loaded and pass config', function () {
>>>>>>>
var sinon = require('sinon')
var chai = require('chai')
chai.use(require('sinon-chai'))
var expect = chai.expect
var Karma = require('../../client/karma')
var MockSocket = require('./mocks').Socket
describe('Karma', function () {
var socket, k, windowNavigator, windowLocation, windowStub, startSpy
var setTransportTo = function (transportName) {
socket._setTransportNameTo(transportName)
socket.emit('connect')
}
beforeEach(function () {
socket = new MockSocket()
windowNavigator = {}
windowLocation = {search: ''}
windowStub = sinon.stub().returns({})
k = new Karma(socket, {}, windowStub, windowNavigator, windowLocation)
startSpy = sinon.spy(k, 'start')
})
it('should start execution when all files loaded and pass config', function () {
<<<<<<<
expect(spyResult).to.not.have.been.called;
k.result('result', {id: 50});
expect(spyResult).to.have.been.called;
expect(spyResult.args[0][0].length).to.be.eql(50);
});
=======
expect(spyResult).not.toHaveBeenCalled()
>>>>>>>
expect(spyResult).to.not.have.been.called
<<<<<<<
k.result();
expect(log).to.be.eql(['start', 'result']);
});
it('should not emit "start" if already done by the adapter', function() {
var log = [];
var spyStart = sinon.spy(function() {
log.push('start');
});
spyResult = sinon.spy(function() {
log.push('result');
});
socket.on('result', spyResult);
socket.on('start', spyStart);
setTransportTo('websocket');
k.info({total: 321});
k.result();
expect(log).to.be.eql(['start', 'result']);
expect(spyStart).to.have.been.calledWith({total: 321});
});
});
=======
k.result()
expect(log).toEqual(['start', 'result'])
})
>>>>>>>
k.result()
expect(log).to.be.eql(['start', 'result'])
})
<<<<<<<
describe('setupContext', function() {
it('should capture alert', function() {
sinon.spy(k, 'log');
=======
describe('setupContext', function () {
it('should capture alert', function () {
spyOn(k, 'log')
>>>>>>>
describe('setupContext', function () {
it('should capture alert', function () {
sinon.spy(k, 'log') |
<<<<<<<
// Restore the state
this.restoreState();
window.addEventListener('hashchange', () => {
this.restoreState();
});
=======
// On complete
if (this.options.onComplete && this.options.onComplete.constructor === Function) {
this.options.onComplete.bind(this.maptable)();
}
>>>>>>>
// Restore the state
this.restoreState();
window.addEventListener('hashchange', () => {
this.restoreState();
});
// On complete
if (this.options.onComplete && this.options.onComplete.constructor === Function) {
this.options.onComplete.bind(this.maptable)();
}
<<<<<<<
attrValue.transform(originalValueRaw, this.maptable.rawData) : originalValueRaw;
if (useNegative && originalValue < 0) {
=======
attrValue.transform(originalValueRaw, this.maptable.data) : originalValueRaw;
if (useNegative && originalValue < 0){
>>>>>>>
attrValue.transform(originalValueRaw, this.maptable.data) : originalValueRaw;
if (useNegative && originalValue < 0) { |
<<<<<<<
saveState: true,
=======
exportSvg: null,
exportSvgClient: false,
>>>>>>>
saveState: true,
exportSvg: null,
exportSvgClient: false, |
<<<<<<<
var hasNextTripTicket = null, previouslyBookedDays = null, nextTripTicketId = null
=======
let hasNextTripTicket = null
let previouslyBookedDays = null
>>>>>>>
let hasNextTripTicket = null
let previouslyBookedDays = null
let nextTripTicketId = null
<<<<<<<
var bookedDays = Object.keys(previouslyBookedDays).map(x=>{return parseInt(x)});
//compare current date with next trip
if (nextTrip && _.includes(bookedDays,nextTrip.date.getTime())) {
hasNextTripTicket = true;
nextTripTicketId = previouslyBookedDays[nextTrip.date.getTime()].id
=======
let bookedDays = Object.keys(previouslyBookedDays).map(x => {
return parseInt(x)
})
// compare current date with next trip
if (nextTrip && _.includes(bookedDays, nextTrip.date.getTime())) {
hasNextTripTicket = true
>>>>>>>
let bookedDays = Object.keys(previouslyBookedDays).map(x => {
return parseInt(x)
})
// compare current date with next trip
if (nextTrip && _.includes(bookedDays, nextTrip.date.getTime())) {
hasNextTripTicket = true
nextTripTicketId =
previouslyBookedDays[nextTrip.date.getTime()].id
<<<<<<<
_.assign(nextTrip, {hasNextTripTicket, seatsAvailable, nextTripTicketId})
=======
_.assign(nextTrip, { hasNextTripTicket, seatsAvailable })
>>>>>>>
_.assign(nextTrip, {
hasNextTripTicket,
seatsAvailable,
nextTripTicketId,
}) |
<<<<<<<
$ionicLoading.show({
template: processingPaymentsTemplate
})
var result = await UserService.beeline({
method: 'POST',
url: '/transactions/payment_ticket_sale',
data: {
stripeToken: stripeToken.id,
trips: BookingService.prepareTrips($scope.book),
creditTag: $scope.book.creditTag,
},
=======
completePayment({
stripeToken: stripeToken.id,
>>>>>>>
$ionicLoading.show({
template: processingPaymentsTemplate
})
var result = await UserService.beeline({
method: 'POST',
url: '/transactions/payment_ticket_sale',
data: {
stripeToken: stripeToken.id,
trips: BookingService.prepareTrips($scope.book),
creditTag: $scope.book.creditTag,
},
});
completePayment({
stripeToken: stripeToken.id,
<<<<<<<
} finally {
$scope.$apply(() => {
$scope.waitingForPaymentResult = false;
})
UserService.fetchRouteCredits(null, true);
=======
>>>>>>>
} finally {
$scope.$apply(() => {
$scope.waitingForPaymentResult = false;
})
UserService.fetchRouteCredits(null, true);
<<<<<<<
creditTag: $scope.book.creditTag,
},
=======
}),
>>>>>>>
creditTag: $scope.book.creditTag,
}), |
<<<<<<<
const original = slurp("tests/original.js");
console.log("testing adding annotations");
const annotated = ngAnnotate(original, {add: true}).src;
test(slurp("tests/with_annotations.js"), annotated, "with_annotations.js");
console.log("testing adding annotations using single quotes");
const annotatedSingleQuotes = ngAnnotate(original, {add: true, single_quotes: true}).src;
test(slurp("tests/with_annotations_single.js"), annotatedSingleQuotes, "with_annotations_single.js");
const rename = slurp("tests/rename.js");
console.log("testing adding annotations and renaming");
const annotatedRenamed = ngAnnotate(rename, {
add: true,
rename: renameOptions,
}).src;
test(slurp("tests/rename.annotated.js"), annotatedRenamed, "rename.annotated.js");
console.log("testing removing annotations");
test(original, ngAnnotate(annotated, {remove: true}).src, "original.js");
console.log("testing adding existing $inject annotations (no change)");
test(slurp("tests/has_inject.js"), ngAnnotate(slurp("tests/has_inject.js"), {add: true}).src);
console.log("testing removing existing $inject annotations");
test(slurp("tests/has_inject_removed.js"), ngAnnotate(slurp("tests/has_inject.js"), {remove: true}).src);
console.log("testing sourcemaps");
const originalSourcemaps = slurp("tests/sourcemaps.coffee");
const compiledSourcemaps = coffee.compile(originalSourcemaps, { sourceFiles: ["sourcemaps.coffee"], generatedFile: "sourcemaps.js", sourceMap: true });
const annotatedSourcemaps = ngAnnotate(compiledSourcemaps.js, {remove: true, add: true, sourcemap: { sourceRoot: "/source/root/dir" }});
test(slurp("tests/sourcemaps.annotated.js"), annotatedSourcemaps.src, "sourcemaps.annotated.js");
testSourcemap(compiledSourcemaps.js, annotatedSourcemaps.src, annotatedSourcemaps.map, "sourcemaps.annotated.js.map");
console.log("testing sourcemap combination");
const inlinedCompiledSourcemaps = compiledSourcemaps.js +
os.EOL +
convertSourceMap.fromJSON(compiledSourcemaps.v3SourceMap).toComment();
const combinedSourcemaps = ngAnnotate(inlinedCompiledSourcemaps, {remove: true, add: true, sourcemap: { inline: true, inFile: "sourcemaps.js", sourceRoot: "/source/root/dir" }});
const combinedSourcemapsSrc = convertSourceMap.removeMapFileComments(combinedSourcemaps.src);
const combinedSourcemapsMap = convertSourceMap.fromSource(combinedSourcemaps.src).toJSON();
testSourcemap(originalSourcemaps, combinedSourcemapsSrc, combinedSourcemapsMap, "sourcemaps.annotated.js.map");
const ngminOriginal = slurp("tests/ngmin-tests/ngmin_original.js");
console.log("testing adding annotations (imported tests)");
const ngminAnnotated = ngAnnotate(ngminOriginal, {add: true, regexp: "^myMod"}).src;
test(slurp("tests/ngmin-tests/ngmin_with_annotations.js"), ngminAnnotated, "ngmin_with_annotations.js");
console.log("testing removing annotations (imported tests)");
test(ngminOriginal, ngAnnotate(ngminAnnotated, {remove: true, regexp: "^myMod"}).src, "ngmin_original.js");
if (fs.existsSync("package.json")) {
console.log("testing package.json")
try {
const json = JSON.parse(slurp("package.json"));
const substr = JSON.stringify({
dependencies: json.dependencies,
devDependencies: json.devDependencies,
}, null, 4);
if (/\^/g.test(substr)) {
console.error("package.json error: shouldn't use the ^ operator");
console.error(substr);
=======
function run(ngAnnotate) {
const original = slurp("tests/original.js");
console.log("testing adding annotations");
const annotated = ngAnnotate(original, {add: true}).src;
test(slurp("tests/with_annotations.js"), annotated, "with_annotations.js");
console.log("testing adding annotations using single quotes");
const annotatedSingleQuotes = ngAnnotate(original, {add: true, single_quotes: true}).src;
test(slurp("tests/with_annotations_single.js"), annotatedSingleQuotes, "with_annotations_single.js");
const rename = slurp("tests/rename.js");
console.log("testing adding annotations and renaming");
const annotatedRenamed = ngAnnotate(rename, {
add: true,
rename: renameOptions,
}).src;
test(slurp("tests/rename.annotated.js"), annotatedRenamed, "rename.annotated.js");
console.log("testing removing annotations");
test(original, ngAnnotate(annotated, {remove: true}).src, "original.js");
console.log("testing adding existing $inject annotations (no change)");
test(slurp("tests/has_inject.js"), ngAnnotate(slurp("tests/has_inject.js"), {add: true}).src);
console.log("testing removing existing $inject annotations");
test(slurp("tests/has_inject_removed.js"), ngAnnotate(slurp("tests/has_inject.js"), {remove: true}).src);
console.log("testing sourcemaps");
const originalSourcemaps = slurp("tests/sourcemaps.js");
const annotatedSourcemaps = ngAnnotate(originalSourcemaps, {remove: true, add: true, sourcemap: true, sourceroot: "/source/root/dir"});
test(slurp("tests/sourcemaps.annotated.js"), annotatedSourcemaps.src, "sourcemaps.annotated.js");
testSourcemap(originalSourcemaps, annotatedSourcemaps.src, annotatedSourcemaps.map, "sourcemaps.annotated.js.map");
const ngminOriginal = slurp("tests/ngmin-tests/ngmin_original.js");
console.log("testing adding annotations (imported tests)");
const ngminAnnotated = ngAnnotate(ngminOriginal, {add: true, regexp: "^myMod"}).src;
test(slurp("tests/ngmin-tests/ngmin_with_annotations.js"), ngminAnnotated, "ngmin_with_annotations.js");
console.log("testing removing annotations (imported tests)");
test(ngminOriginal, ngAnnotate(ngminAnnotated, {remove: true, regexp: "^myMod"}).src, "ngmin_original.js");
if (fs.existsSync("package.json")) {
console.log("testing package.json")
try {
const json = JSON.parse(slurp("package.json"));
const substr = JSON.stringify({
dependencies: json.dependencies,
devDependencies: json.devDependencies,
}, null, 4);
if (/\^/g.test(substr)) {
console.error("package.json error: shouldn't use the ^ operator");
console.error(substr);
process.exit(-1);
}
} catch (e) {
console.error("package.json error: invalid json");
>>>>>>>
function run(ngAnnotate) {
const original = slurp("tests/original.js");
console.log("testing adding annotations");
const annotated = ngAnnotate(original, {add: true}).src;
test(slurp("tests/with_annotations.js"), annotated, "with_annotations.js");
console.log("testing adding annotations using single quotes");
const annotatedSingleQuotes = ngAnnotate(original, {add: true, single_quotes: true}).src;
test(slurp("tests/with_annotations_single.js"), annotatedSingleQuotes, "with_annotations_single.js");
const rename = slurp("tests/rename.js");
console.log("testing adding annotations and renaming");
const annotatedRenamed = ngAnnotate(rename, {
add: true,
rename: renameOptions,
}).src;
test(slurp("tests/rename.annotated.js"), annotatedRenamed, "rename.annotated.js");
console.log("testing removing annotations");
test(original, ngAnnotate(annotated, {remove: true}).src, "original.js");
console.log("testing adding existing $inject annotations (no change)");
test(slurp("tests/has_inject.js"), ngAnnotate(slurp("tests/has_inject.js"), {add: true}).src);
console.log("testing removing existing $inject annotations");
test(slurp("tests/has_inject_removed.js"), ngAnnotate(slurp("tests/has_inject.js"), {remove: true}).src);
console.log("testing sourcemaps");
const originalSourcemaps = slurp("tests/sourcemaps.coffee");
const compiledSourcemaps = coffee.compile(originalSourcemaps, { sourceFiles: ["sourcemaps.coffee"], generatedFile: "sourcemaps.js", sourceMap: true });
const annotatedSourcemaps = ngAnnotate(compiledSourcemaps.js, {remove: true, add: true, sourcemap: { sourceRoot: "/source/root/dir" }});
test(slurp("tests/sourcemaps.annotated.js"), annotatedSourcemaps.src, "sourcemaps.annotated.js");
testSourcemap(compiledSourcemaps.js, annotatedSourcemaps.src, annotatedSourcemaps.map, "sourcemaps.annotated.js.map");
console.log("testing sourcemap combination");
const inlinedCompiledSourcemaps = compiledSourcemaps.js +
os.EOL +
convertSourceMap.fromJSON(compiledSourcemaps.v3SourceMap).toComment();
const combinedSourcemaps = ngAnnotate(inlinedCompiledSourcemaps, {remove: true, add: true, sourcemap: { inline: true, inFile: "sourcemaps.js", sourceRoot: "/source/root/dir" }});
const combinedSourcemapsSrc = convertSourceMap.removeMapFileComments(combinedSourcemaps.src);
const combinedSourcemapsMap = convertSourceMap.fromSource(combinedSourcemaps.src).toJSON();
testSourcemap(originalSourcemaps, combinedSourcemapsSrc, combinedSourcemapsMap, "sourcemaps.annotated.js.map");
const ngminOriginal = slurp("tests/ngmin-tests/ngmin_original.js");
console.log("testing adding annotations (imported tests)");
const ngminAnnotated = ngAnnotate(ngminOriginal, {add: true, regexp: "^myMod"}).src;
test(slurp("tests/ngmin-tests/ngmin_with_annotations.js"), ngminAnnotated, "ngmin_with_annotations.js");
console.log("testing removing annotations (imported tests)");
test(ngminOriginal, ngAnnotate(ngminAnnotated, {remove: true, regexp: "^myMod"}).src, "ngmin_original.js");
if (fs.existsSync("package.json")) {
console.log("testing package.json")
try {
const json = JSON.parse(slurp("package.json"));
const substr = JSON.stringify({
dependencies: json.dependencies,
devDependencies: json.devDependencies,
}, null, 4);
if (/\^/g.test(substr)) {
console.error("package.json error: shouldn't use the ^ operator");
console.error(substr);
process.exit(-1);
}
} catch (e) {
console.error("package.json error: invalid json"); |
<<<<<<<
["add", "remove", "o", "regexp", "rename", "single_quotes", "plugin", "stats"].forEach(function(opt) {
=======
if (filename !== "-") {
config.inFile = filename;
}
["add", "remove", "o", "sourcemap", "sourceroot", "regexp", "rename", "single_quotes", "plugin", "stats", "es6"].forEach(function(opt) {
>>>>>>>
if (filename !== "-") {
config.inFile = filename;
}
["add", "remove", "o", "regexp", "rename", "single_quotes", "plugin", "stats", "es6"].forEach(function(opt) { |
<<<<<<<
if (window.openDatabase) {
persistence.db.implementation = "html5";
} else if (window.google && google.gears) {
persistence.db.implementation = "gears";
=======
// window object does not exist on Qt Declarative UI (http://doc.trolltech.org/4.7-snapshot/declarativeui.html)
if (window && window.google && google.gears) {
persistence.db.implementation = "gears";
} else if (window && window.openDatabase) {
persistence.db.implementation = "html5";
} else if (openDatabaseSync) {
// TODO: find a browser that implements openDatabaseSync and check out if
// it is attached to the window or some other object
persistence.db.implementation = "html5-sync";
>>>>>>>
// window object does not exist on Qt Declarative UI (http://doc.trolltech.org/4.7-snapshot/declarativeui.html)
if (window && window.openDatabase) {
persistence.db.implementation = "html5";
} else if (window && window.google && google.gears) {
persistence.db.implementation = "gears";
} else if (openDatabaseSync) {
// TODO: find a browser that implements openDatabaseSync and check out if
// it is attached to the window or some other object
persistence.db.implementation = "html5-sync"; |
<<<<<<<
});
const StartPipeline = Loadable({
loader: () => import('./components/StartPipeline.js'),
loading: Loading,
});
const Pipelines = Loadable({
loader: () => import('./components/Pipelines.js'),
loading: Loading,
});
=======
})
const Label = Loadable({
loader: () => import('./components/Label.js'),
loading: Loading,
})
>>>>>>>
})
const StartPipeline = Loadable({
loader: () => import('./components/StartPipeline.js'),
loading: Loading,
})
const Pipelines = Loadable({
loader: () => import('./components/Pipelines.js'),
loading: Loading,
})
const Label = Loadable({
loader: () => import('./components/Label.js'),
loading: Loading,
})
<<<<<<<
{ path: '/dashboard', name: 'Dashboard', component: Dashboard },
{ path: '/start-pipeline', name: 'Start a Pipeline', component: StartPipeline },
{ path: '/pipelines', name: 'Pipelines', component: Pipelines },
=======
{ path: '/dashboard', name: 'Dashboard', component: Dashboard },
{ path: '/labels', name: 'Manage Labels', component: Label }
>>>>>>>
{ path: '/dashboard', name: 'Dashboard', component: Dashboard },
{ path: '/start-pipeline', name: 'Start a Pipeline', component: StartPipeline },
{ path: '/pipelines', name: 'Pipelines', component: Pipelines },
{ path: '/labels', name: 'Manage Labels', component: Label }, |
<<<<<<<
var $newRow = $( '<' + nodeName + ' class="postbox cmb-row cmb-repeatable-grouping" data-iterator="'+ cmb.idNumber +'">'+ $row.html() +'</' + nodeName + '>' );
=======
var $newRow = $( '<div id="'+ $oldRowId + cmb.idNumber +'" class="postbox cmb-row cmb-repeatable-grouping" data-iterator="'+ cmb.idNumber +'">'+ $row.html() +'</div>' );
>>>>>>>
var $newRow = $( '<' + nodeName + ' id="'+ $oldRowId + cmb.idNumber +'" class="postbox cmb-row cmb-repeatable-grouping" data-iterator="'+ cmb.idNumber +'">'+ $row.html() +'</' + nodeName + '>' ); |
<<<<<<<
export default function initStripe(UserService) {
var stripePromise = UserService.beeline({
method: 'GET',
url: '/stripe-key'
})
.then((response) => {
Stripe.setPublishableKey(response.data.publicKey);
return response.data.publicKey
})
=======
export default function initStripe(UserService) {
var stripeKeyPromise = UserService.beeline({
url: '/stripe-key',
method: 'GET',
})
.then((response) => {
return response.data.publicKey;
});
>>>>>>>
export default function initStripe(UserService) {
var stripeKeyPromise = UserService.beeline({
url: '/stripe-key',
method: 'GET',
})
.then((response) => {
Stripe.setPublishableKey(response.data.publicKey);
return response.data.publicKey;
});
<<<<<<<
return stripePromise.then((stripeKey) => {
=======
return stripeKeyPromise.then((stripeKey) => {
return new Promise((resolve, reject) => {
>>>>>>>
return stripeKeyPromise.then((stripeKey) => {
return new Promise((resolve, reject) => { |
<<<<<<<
Modal,
=======
Popover,
PopoverControl,
PopoverBody,
>>>>>>>
Modal,
Popover,
PopoverControl,
PopoverBody, |
<<<<<<<
import {Pagination} from '../src/Pagination/Pagination'
=======
import {Menu, MenuList, MenuItem, MenuGroup} from '../src/Menu/Menu'
>>>>>>>
import {Menu, MenuList, MenuItem, MenuGroup} from '../src/Menu/Menu'
import {Pagination} from '../src/Pagination/Pagination'
<<<<<<<
Pagination,
=======
Menu,
MenuList,
MenuItem,
MenuGroup,
>>>>>>>
Menu,
MenuList,
MenuItem,
MenuGroup,
Pagination, |
<<<<<<<
<div className="block">
<Heart color="#be97e8" />
<Heart color="#be97e8" size={40} />
<Heart color="#be97e8" size={20} />
</div>
=======
<div className="block">
<DualRing color="#be97e8" />
<DualRing color="#be97e8" size={40} />
<DualRing color="#be97e8" size={20} />
</div>
>>>>>>>
<div className="block">
<DualRing color="#be97e8" />
<DualRing color="#be97e8" size={40} />
<DualRing color="#be97e8" size={20} />
</div>
<div className="block">
<Heart color="#be97e8" />
<Heart color="#be97e8" size={40} />
<Heart color="#be97e8" size={20} />
</div> |
<<<<<<<
if (error.status === 400) {
promptRegister(telephoneNumber);
}
else {
$ionicPopup.alert({
title: "Error while trying to connect to server.",
subTitle: error.data && error.data.message
});
}
=======
$ionicPopup.alert({
title: "Error while trying to connect to server.",
subTitle: error && error.data && error.data.message
});
>>>>>>>
$ionicPopup.alert({
title: "Error while trying to connect to server.",
subTitle: error.data && error.data.message
});
<<<<<<<
subTitle: error.data && error.data.message
=======
subTitle: error && error.data && error.data.message
>>>>>>>
subTitle: error.data && error.data.message |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.